replaced Dune 2000 AUD with original WAV

removed *.aud hard-coding everywhere

OpenRA.Mods.RA/Armament.cs

@@ -146,7 +146,7 @@ namespace OpenRA.Mods.RA
 						self.World.Add(projectile);
 
 					if (args.weapon.Report != null && args.weapon.Report.Any())
-						Sound.Play(args.weapon.Report.Random(self.World.SharedRandom) + ".aud", self.CenterLocation);
+						Sound.Play(args.weapon.Report.Random(self.World.SharedRandom), self.CenterLocation);
 				}
 			});
 

OpenRA.Mods.RA/CarpetBomb.cs

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA
 				self.World.Add(args.weapon.Projectile.Create(args));
 
 				if (args.weapon.Report != null && args.weapon.Report.Any())
-					Sound.Play(args.weapon.Report.Random(self.World.SharedRandom) + ".aud", self.CenterLocation);
+					Sound.Play(args.weapon.Report.Random(self.World.SharedRandom), self.CenterLocation);
 			}
 		}
 	}

OpenRA.Mods.RA/Combat.cs

@@ -24,10 +24,10 @@ namespace OpenRA.Mods.RA
 		static string GetImpactSound(WarheadInfo warhead, bool isWater)
 		{
 			if (isWater && warhead.WaterImpactSound != null)
-				return warhead.WaterImpactSound + ".aud";
+				return warhead.WaterImpactSound;
 
 			if (warhead.ImpactSound != null)
-				return warhead.ImpactSound + ".aud";
+				return warhead.ImpactSound;
 
 			return null;
 		}
@@ -154,7 +154,7 @@ namespace OpenRA.Mods.RA
 			};
 
 			if (args.weapon.Report != null && args.weapon.Report.Any())
-				Sound.Play(args.weapon.Report.Random(attacker.World.SharedRandom) + ".aud", pos);
+				Sound.Play(args.weapon.Report.Random(attacker.World.SharedRandom), pos);
 
 			DoImpacts(args);
 		}

mods/cnc/weapons.yaml

@@ -1,10 +1,10 @@
 FlametankExplode:
 	Warhead:
-		Damage: 100		
+		Damage: 100
-		Spread: 24		
+		Spread: 24
 		Explosion: big_napalm
 		InfDeath: 5
-		ImpactSound: xplobig6
+		ImpactSound: xplobig6.aud
 
 HeliCrash:
 	Warhead:
@@ -12,39 +12,39 @@ HeliCrash:
 		Spread: 10
 		Explosion: poof
 		InfDeath: 4
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 
 HeliExplode:
 	Warhead:
 		Explosion: small_building
 		InfDeath: 4
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 
 UnitExplode:
 	Warhead:
 		Damage: 500
 		Spread: 10
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
 		Explosion: poof
 		InfDeath: 4
-		ImpactSound: xplobig6
+		ImpactSound: xplobig6.aud
 
 UnitExplodeSmall:
 	Warhead:
 		Damage: 40
 		Spread: 10
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
 		Explosion: big_frag
 		InfDeath: 4
-		ImpactSound: xplobig4
+		ImpactSound: xplobig4.aud
 
 GrenadierExplode:
 	Warhead:
@@ -57,21 +57,21 @@ GrenadierExplode:
 			Heavy: 25%
 		Explosion: poof
 		InfDeath: 3
-		ImpactSound: xplosml2
+		ImpactSound: xplosml2.aud
 
 Atomic:
 	Warhead@impact:
 		Damage: 1000
 		Spread: 6
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 60%
 			Light: 60%
 			Heavy: 50%
 		Explosion: 6
 		InfDeath: 5
-		ImpactSound: nukexplo
+		ImpactSound: nukexplo.aud
 	Warhead@areanuke:
 		DamageModel: PerCell
 		Damage: 250
@@ -85,7 +85,7 @@ Atomic:
 			Heavy: 50%
 		Delay: 3
 		InfDeath: 5
-		ImpactSound: xplobig4
+		ImpactSound: xplobig4.aud
 
 IonCannon:
 	ValidTargets: Ground, Air
@@ -93,7 +93,7 @@ IonCannon:
 		Damage: 900
 		Spread: 16
 		Ore: true
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 100%
 			Light: 100%
@@ -109,15 +109,15 @@ IonCannon:
 		InfDeath: 5
 
 Sniper:
-	Report: RAMGUN2
+	Report: RAMGUN2.AUD
 	ROF: 40
 	Range: 6
 	Projectile: Bullet
 		Speed: 100
-	Warhead: 
+	Warhead:
 		Damage: 100
 		Spread: 1
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 5%
 			Light: 5%
@@ -127,13 +127,13 @@ Sniper:
 HighV:
 	ROF: 30
 	Range: 6
-	Report: GUN8
+	Report: GUN8.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Damage: 50
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 50%
 			Light: 100%
@@ -147,13 +147,13 @@ HeliAGGun:
 	BurstDelay: 0
 	Range: 4
 	ValidTargets: Ground
-	Report: gun5
+	Report: gun5.aud
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Damage: 20
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 50%
 			Light: 50%
@@ -167,13 +167,13 @@ HeliAAGun:
 	BurstDelay: 0
 	Range: 4
 	ValidTargets: Air
-	Report: gun5
+	Report: gun5.aud
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Damage: 20
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 50%
 			Light: 50%
@@ -184,7 +184,7 @@ HeliAAGun:
 Pistol:
 	ROF: 7
 	Range: 3
-	Report: GUN18
+	Report: GUN18.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -201,7 +201,7 @@ Pistol:
 M16:
 	ROF: 20
 	Range: 4
-	Report: MGUN2
+	Report: MGUN2.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -218,7 +218,7 @@ M16:
 Rockets:
 	ROF: 50
 	Range: 6
-	Report: BAZOOK1
+	Report: BAZOOK1.AUD
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Arm: 0
@@ -233,7 +233,7 @@ Rockets:
 		RangeLimit: 30
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 50%
 			Wood: 85%
 			Light: 100%
@@ -241,14 +241,14 @@ Rockets:
 			Concrete: 25%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 30
 
 BikeRockets:
 	ROF: 50
 	Range: 6
-	Report: BAZOOK1
+	Report: BAZOOK1.AUD
 	ValidTargets: Ground, Air
 	Burst: 2
 	BurstDelay: 10
@@ -273,7 +273,7 @@ BikeRockets:
 			Concrete: 50%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 30
 
@@ -282,7 +282,7 @@ OrcaAGMissiles:
 	Burst: 1
 	BurstDelay: 0
 	Range: 5
-	Report: BAZOOK1
+	Report: BAZOOK1.AUD
 	ValidTargets: Ground
 	Projectile: Missile
 		Arm: 0
@@ -297,14 +297,14 @@ OrcaAGMissiles:
 		RangeLimit: 30
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 50%
 			Wood: 100%
 			Light: 100%
 			Heavy: 50%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 25
 
@@ -313,7 +313,7 @@ OrcaAAMissiles:
 	Burst: 1
 	BurstDelay: 0
 	Range: 5
-	Report: BAZOOK1
+	Report: BAZOOK1.AUD
 	ValidTargets: Air
 	Projectile: Missile
 		Arm: 0
@@ -328,26 +328,26 @@ OrcaAAMissiles:
 		RangeLimit: 30
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 50%
 			Wood: 100%
 			Light: 100%
 			Heavy: 50%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 25
 
 Flamethrower:
 	ROF: 50
 	Range: 2.5
-	Report: FLAMER2
+	Report: FLAMER2.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Spread: 8
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 100%
 			Light: 75%
@@ -361,34 +361,34 @@ Flamethrower:
 BigFlamer:
 	ROF: 50
 	Range: 3.5
-	Report: FLAMER2
+	Report: FLAMER2.AUD
 	Projectile: Bullet
 		Speed: 20
 	Burst:2
 	BurstDelay:25
 	Warhead:
 		Spread: 8
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 100%
 			Light: 50%
 			Heavy: 25%
 		InfDeath: 5
 		Explosion: med_napalm
-		ImpactSound: flamer2
+		ImpactSound: flamer2.aud
 		SmudgeType: Scorch
 		Damage: 90
 
 Chemspray:
 	ROF: 70
 	Range: 3
-	Report: FLAMER2
+	Report: FLAMER2.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Damage: 80
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 75%
 			Light: 75%
@@ -396,7 +396,7 @@ Chemspray:
 		InfDeath: 6
 		Explosion: chemball
 		SmudgeType: Scorch
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 
 Grenade:
 	ROF: 50
@@ -409,27 +409,27 @@ Grenade:
 		Image: BOMB
 	Warhead:
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
 		InfDeath: 3
 		Explosion: small_poof
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 50
 
 70mm:
 	ROF: 38
 	Range: 4
-	Report: TNKFIRE3
+	Report: TNKFIRE3.AUD
 	Projectile: Bullet
 		Image: 120MM
 		Speed: 60
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 100%
@@ -437,40 +437,40 @@ Grenade:
 			Concrete: 50%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 25
 
 105mm:
 	ROF: 50
 	Range: 4.75
-	Report: TNKFIRE4
+	Report: TNKFIRE4.AUD
 	Projectile: Bullet
 		Image: 120MM
 		Speed: 40
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
 			Heavy: 100%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 30
 
 120mm:
 	ROF: 50
 	Range: 4.75
-	Report: TNKFIRE6
+	Report: TNKFIRE6.AUD
 	Projectile: Bullet
 		Image: 120MM
 		Speed: 40
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 100%
@@ -478,14 +478,14 @@ Grenade:
 			Concrete: 50%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 40
 
 120mmDual:
 	ROF: 60
 	Range: 4.75
-	Report: TNKFIRE6
+	Report: TNKFIRE6.AUD
 	Burst: 2
 	BurstDelay: 5
 	Projectile: Bullet
@@ -493,7 +493,7 @@ Grenade:
 		Speed: 40
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 100%
@@ -501,34 +501,34 @@ Grenade:
 			Concrete: 100%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 40
 
 TurretGun:
 	ROF: 25
 	Range: 6
-	Report: TNKFIRE6
+	Report: TNKFIRE6.AUD
 	Projectile: Bullet
 		Image: 120MM
 		Speed: 50
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 25%
 			Wood: 25%
 			Light: 80%
 			Heavy: 100%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 50
 
 MammothMissiles:
 	ROF: 100
 	Range: 5
-	Report: ROCKET1
+	Report: ROCKET1.AUD
 	ValidTargets: Ground, Air
 	Burst: 2
 	Projectile: Missile
@@ -544,14 +544,14 @@ MammothMissiles:
 		RangeLimit: 35
 	Warhead:
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 40%
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 75
 
@@ -561,7 +561,7 @@ MammothMissiles:
 	MinRange: 3
 	Burst: 2
 	BurstDelay: 20
-	Report: ROCKET1
+	Report: ROCKET1.AUD
 	ValidTargets: Ground
 	Projectile: Bullet
 		Arm: 5
@@ -576,21 +576,21 @@ MammothMissiles:
 		Speed: 20
 	Warhead:
 		Spread: 15
-		Versus: 
+		Versus:
 			None: 25%
 			Wood: 30%
 			Light: 100%
 			Heavy: 50%
 		InfDeath: 4
 		Explosion: med_frag
-		ImpactSound: xplobig4
+		ImpactSound: xplobig4.aud
 		SmudgeType: Crater
 		Damage: 100
 
 227mm.stnk:
 	ROF: 70
 	Range: 7
-	Report: ROCKET1
+	Report: ROCKET1.AUD
 	Burst: 2
 	BurstDelay: 10
 	ValidTargets: Ground, Air
@@ -614,7 +614,7 @@ MammothMissiles:
 			Heavy: 90%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 60
 
@@ -622,7 +622,7 @@ ArtilleryShell:
 	ROF: 65
 	Range: 11
 	MinRange: 2
-	Report: TNKFIRE2
+	Report: TNKFIRE2.AUD
 	Projectile: Bullet
 		Speed: 12
 		High: yes
@@ -633,7 +633,7 @@ ArtilleryShell:
 	Warhead:
 		Damage: 150
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 50%
 			Light: 60%
@@ -641,18 +641,18 @@ ArtilleryShell:
 		InfDeath: 3
 		Explosion: poof
 		SmudgeType: Crater
-		ImpactSound: XPLOSML2
+		ImpactSound: XPLOSML2.AUD
 
 MachineGun:
 	ROF: 20
 	Burst: 4
 	Range: 4
-	Report: MGUN11
+	Report: MGUN11.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 25%
 			Light: 75%
@@ -667,7 +667,7 @@ BoatMissile:
 	Range: 8
 	Burst: 2
 	BurstDelay: 7
-	Report: ROCKET2
+	Report: ROCKET2.AUD
 	Projectile: Missile
 		Arm: 0
 		High: yes
@@ -688,14 +688,14 @@ BoatMissile:
 			Heavy: 25%
 		InfDeath: 3
 		Explosion: small_poof
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 60
 
 TowerMissle:
 	ROF: 24
 	Range: 8
-	Report: ROCKET2
+	Report: ROCKET2.AUD
 	ValidTargets: Ground, Air
 	Burst: 2
 	BurstDelay: 16
@@ -719,7 +719,7 @@ TowerMissle:
 			Heavy: 80%
 		InfDeath: 3
 		Explosion: med_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 45
 
@@ -729,28 +729,28 @@ Napalm:
 		Image: BOMBLET
 	Warhead:
 		Spread: 20
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 100%
 			Light: 60%
 			Heavy: 55%
 		InfDeath: 5
 		Explosion: med_napalm
-		ImpactSound: flamer2
+		ImpactSound: flamer2.aud
 		SmudgeType: Scorch
 		Damage: 130
 
 Napalm.Crate:
 	Warhead:
 		Spread: 4
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 100%
 			Light: 60%
 			Heavy: 25%
 		InfDeath: 5
 		Explosion: med_napalm
-		ImpactSound: flamer2
+		ImpactSound: flamer2.aud
 		SmudgeType: Scorch
 		Damage: 500
 
@@ -758,7 +758,7 @@ Laser:
 	ROF: 90
 	Range: 8.5
 	Charges: true
-	Report: OBELRAY1
+	Report: OBELRAY1.AUD
 	Projectile: LaserZap
 		BeamWidth: 2
 		HitAnim: laserfire
@@ -773,7 +773,7 @@ Laser:
 SAMMissile:
 	ROF: 15
 	Range: 10
-	Report: ROCKET2
+	Report: ROCKET2.AUD
 	ValidTargets: Air
 	Projectile: Missile
 		Arm: 0
@@ -787,21 +787,21 @@ SAMMissile:
 		Trail: smokey
 	Warhead: AP
 		Spread: 16
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 100%
 			Light: 100%
 			Heavy: 75%
 		InfDeath: 4
 		Explosion: small_frag
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 30
 
 HonestJohn:
 	ROF: 200
 	Range: 10
-	Report: ROCKET1
+	Report: ROCKET1.AUD
 	Projectile: Bullet
 		Arm: 10
 		High: yes
@@ -815,14 +815,14 @@ HonestJohn:
 		Angle: .15
 	Warhead:
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
 		InfDeath: 3
 		Explosion: small_poof
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 100
 
@@ -837,7 +837,7 @@ Tiberium:
 APCGun:
 	ROF: 12
 	Range: 5
-	Report: gun20
+	Report: gun20.aud
 	ValidTargets: Ground
 	Projectile: Bullet
 		Speed: 100
@@ -854,7 +854,7 @@ APCGun:
 APCGun.AA:
 	ROF: 12
 	Range: 7
-	Report: gun20
+	Report: gun20.aud
 	ValidTargets: Air
 	Projectile: Bullet
 		Speed: 100
@@ -872,7 +872,7 @@ Patriot:
 	MinRange: 1
 	Burst: 2
 	BurstDelay: 15
-	Report:	ROCKET2
+	Report: ROCKET2.AUD
 	ValidTargets: Air
 	Projectile: Missile
 		High: yes
@@ -885,13 +885,13 @@ Patriot:
 		Angle: .15
 	Warhead: AP
 		Spread: 16
-		Versus: 
+		Versus:
-			None: 100%	
+			None: 100%
 			Wood: 100%
 			Light: 100%
 			Heavy: 75%
-		InfDeath: 4	
+		InfDeath: 4
 		Explosion: poof
-		ImpactSound: xplos
+		ImpactSound: xplos.aud
 		SmudgeType: Crater
 		Damage: 30

mods/d2k/mod.yaml

@@ -20,6 +20,7 @@ Folders:
 Packages:
 	~main.mix
 	conquer.mix
+	SOUND.RS
 
 Rules:
 	mods/d2k/rules/system.yaml
@@ -92,7 +93,7 @@ Movies:
 
 LoadScreen: D2kLoadScreen
 	InstallerMenuWidget: INSTALL_PANEL
-	TestFile: deathhandlaunch.shp
+	TestFile: SOUND.RS
 	PackageURL: http://open-ra.org/get-dependency.php?file=d2k-complete-packages
 
 ServerTraits:

mods/d2k/notifications.yaml

@@ -34,6 +34,7 @@ Speech:
 		BuildingCaptured: CAPT
 
 Sounds:
+	DefaultVariant: .WAV
 	Notifications:
 		RadarUp: MULTI1
 		RadarDown:

mods/d2k/rules/atreides.yaml

@@ -241,5 +241,5 @@ FREMEN:
 	Cloak:
 		InitialDelay: 250
 		CloakDelay: 250
-		CloakSound: 
+		CloakSound: STEALTH1.WAV
-		UncloakSound: 
+		UncloakSound: STEALTH2.WAV

mods/d2k/rules/defaults.yaml

@@ -27,7 +27,6 @@
 	ProximityCaptor:
 		Types:Vehicle
 	GivesBounty:
-	#WithSmoke:
 	Repairable:
 		RepairBuildings: repair
 	DebugMuzzlePositions:
@@ -64,7 +63,6 @@
 	ProximityCaptor:
 		Types:Tank
 	GivesBounty:
-	#WithSmoke:
 	Repairable:
 		RepairBuildings: repair
 	DebugMuzzlePositions:
@@ -155,7 +153,7 @@
 		Types:Infantry
 	GivesBounty:
 	CrushableInfantry:
-		CrushSound: squishy2.aud
+		CrushSound: CRUSH1.WAV
 	RepairableNear:
 		Buildings: barra, barro
 		CloseEnough: 1
@@ -199,15 +197,15 @@
 		Dimensions: 1,1
 		Footprint: x
 		TerrainTypes: Rock, Concrete
-		BuildSounds: BUILD1.aud
+		BuildSounds: BUILD1.WAV
-		SellSounds: BUILD1.aud
+		SellSounds: BUILD1.WAV
 		Adjacent: 3
 	GivesBuildableArea:
 	Capturable:
 	CapturableBar:
 	SoundOnDamageTransition:
-		DamagedSound: EXPLSML1.aud
+		DamagedSound: EXPLSML1.WAV
-		DestroyedSound: EXPLHG1.aud
+		DestroyedSound: EXPLHG1.WAV
 	RenderBuilding:
 	WithBuildingExplosion:
 	RepairableBuilding:

mods/d2k/rules/infantry.yaml

@@ -47,7 +47,6 @@ ENGINEER:
 		PipType: Yellow
 	EngineerRepair:
 	Captures:
-	#TakeCover:
 	-AutoTarget:
 	AttackMove:
 		JustMove: true

mods/d2k/rules/ordos.yaml

@@ -179,8 +179,8 @@ STEALTHTRIKE:
 	Cloak:
 		InitialDelay: 45
 		CloakDelay: 90
-		CloakSound: appear1.aud
+		CloakSound: STEALTH1.WAV
-		UncloakSound: appear1.aud
+		UncloakSound: STEALTH2.WAV
 	AutoTarget:
 		InitialStance: HoldFire
 

mods/d2k/rules/structures.yaml

@@ -333,7 +333,7 @@ WALL:
 		#Hotkey: g
 	SoundOnDamageTransition:
 		DamagedSound:
-		DestroyedSound: CRMBLE2.aud
+		DestroyedSound: EXPLSML4.WAV
 	Valued:
 		Cost: 100
 	CustomSellValue:
@@ -344,8 +344,8 @@ WALL:
 		Icon: wallaicon
 	AppearsOnRadar:
 	Building:
-		BuildSounds: CHUNG.aud
+		BuildSounds: CHUNG.WAV
-		SellSounds: CHUNG.aud
+		SellSounds: CHUNG.WAV
 		Adjacent: 7
 		TerrainTypes: Rock
 	Health:
@@ -391,8 +391,8 @@ GUNTOWER:
 	Building:
 		Power: -20
 		Adjacent: 4
-		BuildSounds: CHUNG.aud
+		BuildSounds: CHUNG.WAV
-		SellSounds: CHUNG.aud
+		SellSounds: CHUNG.WAV
 	Selectable:
 		Bounds: 32,32
 		Priority: 3
@@ -449,8 +449,8 @@ ROCKETTOWER:
 	Building:
 		Power: -30
 		Adjacent: 4
-		BuildSounds: CHUNG.aud
+		BuildSounds: CHUNG.WAV
-		SellSounds: CHUNG.aud
+		SellSounds: CHUNG.WAV
 	Selectable:
 		Bounds: 32,32
 		Priority: 3

mods/d2k/rules/system.yaml

@@ -473,8 +473,8 @@ CRATE:
 		SelectionShares: 15
 		InitialDelay: 15
 		CloakDelay: 90
-		CloakSound: appear1.aud
+		CloakSound: STEALTH1.WAV
-		UncloakSound: appear1.aud
+		UncloakSound: STEALTH2.WAV
 		Effect: cloak
 	RenderSimple:
 	BelowUnits:

mods/d2k/rules/vehicles.yaml

@@ -30,7 +30,7 @@
 		Weapon: UnitExplodeScale
 		EmptyWeapon: UnitExplodeScale
 	Transforms:
-		TransformSounds: BUILD1.aud
+		TransformSounds: BUILD1.WAV
 	LeavesHusk:
 		HuskActor: MCV.Husk
 

mods/d2k/voices.yaml

@@ -2,10 +2,15 @@
 
 GenericVoice:
 	DefaultVariant: .AUD
+	Variants:
+		atreides: .WAV
+		ordos: .WAV
+		harkonnen: .WAV
 	Voices:
 		Select: G_SSEL1,G_SSEL2,G_SSEL3
 		Move: G_SCONF1,G_SCONF2,G_SCONF3
 		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
+	DisableVariants: Select, Move
 
 VehicleVoice:
 	DefaultVariant: .AUD
@@ -19,6 +24,10 @@ VehicleVoice:
 
 InfantryVoice:
 	DefaultVariant: .AUD
+	Variants:
+		atreides: .WAV
+		ordos: .WAV
+		harkonnen: .WAV
 	Prefixes:
 		atreides: A
 		ordos: O
@@ -28,9 +37,14 @@ InfantryVoice:
 		Move: _ICONF1,_ICONF2,_ICONF3
 		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
 	DisablePrefixes: Die
+	DisableVariants: Select, Move
 
 EngineerVoice:
 	DefaultVariant: .AUD
+	Variants:
+		atreides: .WAV
+		ordos: .WAV
+		harkonnen: .WAV
 	Prefixes:
 		atreides: A
 		ordos: O
@@ -40,17 +54,28 @@ EngineerVoice:
 		Move: _ECONF1,_ECONF2,_ECONF3
 		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
 	DisablePrefixes: Die
+	DisableVariants: Select, Move
 
 FremenVoice:
 	DefaultVariant: .AUD
+	Variants:
+		atreides: .WAV
+		ordos: .WAV
+		harkonnen: .WAV
 	Voices:
 		Select: A_FSEL1,A_FSEL2,A_FSEL3
 		Move: A_FCONF1,A_FCONF2,A_FCONF3
 		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
+	DisableVariants: Select, Move
 
 SaboteurVoice:
 	DefaultVariant: .AUD
+	Variants:
+		atreides: .WAV
+		ordos: .WAV
+		harkonnen: .WAV
 	Voices:
 		Select: O_SSEL1,O_SSEL2,O_SSEL3
 		Move: O_SCONF1,O_SCONF2,O_SCONF3
-		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
+		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
+	DisableVariants: Select, Move

mods/d2k/weapons.yaml

@@ -22,7 +22,7 @@ LMG:
 Bazooka:
 	ROF: 50
 	Range: 5
-	Report: BAZOOK1
+	Report: BAZOOK1.WAV
 	ValidTargets: Ground
 	Projectile: Missile
 		Speed: 25
@@ -46,12 +46,12 @@ Bazooka:
 		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 50
-		ImpactSound: EXPLSML2
+		ImpactSound: EXPLSML2.WAV
 
 Sniper:
 	ROF: 100
 	Range: 8.5
-	Report: RIFLE
+	Report: FREMODD1.WAV
 	Projectile: Bullet
 		Speed: 150
 		ContrailLength: 6
@@ -72,7 +72,7 @@ Sniper:
 Vulcan:
 	ROF: 30
 	Range: 5.75
-	Report: VULCAN
+	Report: VULCAN.WAV
 	ValidTargets: Ground, Air
 	Projectile: Bullet
 		Speed: 100
@@ -95,7 +95,7 @@ Slung:
 	ROF: 60
 	Delay: 5
 	Range: 5.5
-	Report: BAZOOK2
+	Report: BAZOOK2.WAV
 	ValidTargets: Ground
 	Projectile: Bullet
 		Speed: 25
@@ -117,14 +117,14 @@ Slung:
 		WaterExplosion: med_splash
 		InfDeath: 4
 		Damage: 30
-		ImpactSound: kaboom25
+		ImpactSound: EXPLLG5.WAV
 
 HMG:
 	ROF: 30
 	Range: 5
 	Burst: 2
 	BurstDelay: 5
-	Report: 20MMGUN1
+	Report: 20MMGUN1.WAV
 	Projectile: Bullet
 		Speed: 100
 		ContrailLength: 3
@@ -147,7 +147,7 @@ HMGo:
 	Range: 5
 	Burst: 2
 	BurstDelay: 5
-	Report: 20MMGUN1
+	Report: 20MMGUN1.WAV
 	Projectile: Bullet
 		Speed: 100
 		ContrailLength: 3
@@ -170,7 +170,7 @@ QuadRockets:
 	Burst: 2
 	BurstDelay: 25
 	Range: 7
-	Report: ROCKET1
+	Report: ROCKET1.WAV
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Arm: 0
@@ -191,14 +191,14 @@ QuadRockets:
 			Concrete: 35%
 		InfDeath: 4
 		Explosion: small_artillery
-		ImpactSound: EXPLSML2
+		ImpactSound: EXPLSML2.WAV
 		SmudgeType: SandCrater, RockCrater
 		Damage: 25
 
 TurretGun:
 	ROF: 35
 	Range: 7
-	Report: TURRET1
+	Report: TURRET1.WAV
 	Projectile: Bullet
 		Speed: 55
 		High: yes
@@ -213,7 +213,7 @@ TurretGun:
 			Light: 100%
 			Concrete: 65%
 		Explosion: med_explosion
-		ImpactSound: kaboom30
+		ImpactSound: EXPLLG3.WAV
 		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 55
@@ -222,7 +222,7 @@ TowerMissile:
 	ROF: 35
 	Range: 7.75
 	MinRange: 1
-	Report: ROCKET1
+	Report: ROCKET1.WAV
 	ValidTargets: Ground, Air
 	Burst: 2
 	BurstDelay: 15
@@ -253,7 +253,7 @@ TowerMissile:
 90mm:
 	ROF: 50
 	Range: 5.75
-	Report: MEDTANK1
+	Report: MEDTANK1.WAV
 	Projectile: Bullet
 		Speed: 50
 		Inaccuracy: 12
@@ -266,7 +266,7 @@ TowerMissile:
 			Light: 100%
 			Concrete: 50%
 		Explosion: small_artillery
-		ImpactSound: kaboom30
+		ImpactSound: EXPLLG3.WAV
 		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 40
@@ -274,7 +274,7 @@ TowerMissile:
 90mma:
 	ROF: 50
 	Range: 7
-	Report: MEDTANK1
+	Report: MEDTANK1.WAV
 	Projectile: Bullet
 		Speed: 55
 		Inaccuracy: 11
@@ -287,7 +287,7 @@ TowerMissile:
 			Light: 100%
 			Concrete: 50%
 		Explosion: small_artillery
-		ImpactSound: kaboom30
+		ImpactSound: EXPLLG3.WAV
 		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 40
@@ -295,7 +295,7 @@ TowerMissile:
 DevBullet:
 	ROF: 50
 	Range: 5
-	Report: TANKHVY1
+	Report: TANKHVY1.WAV
 	Projectile: Bullet
 		Speed: 50
 		Image: doubleblast
@@ -318,7 +318,7 @@ DevBullet:
 	MinRange: 4
 	Burst: 4
 	BurstDelay: 15
-	Report: MISSLE1
+	Report: MISSLE1.WAV
 	ValidTargets: Ground
 	Projectile: Bullet
 		Speed: 28
@@ -340,7 +340,7 @@ DevBullet:
 			Concrete: 80%
 		InfDeath: 4
 		Explosion: artillery
-		ImpactSound: EXPLSML2
+		ImpactSound: EXPLSML2.WAV
 		SmudgeType: SandCrater, RockCrater
 		Damage: 60
 
@@ -348,7 +348,7 @@ FakeMissile:
 	ROF: 120
 	Range: 8
 	Burst: 1
-	Report: MISSLE1
+	Report: MISSLE1.WAV
 	Projectile: Bullet
 		Speed: 35
 		High: true
@@ -367,13 +367,13 @@ FakeMissile:
 		Explosion: large_explosion
 		SmudgeType: SandCrater, RockCrater
 		Damage: 10
-		ImpactSound: EXPLSML2
+		ImpactSound: EXPLSML2.WAV
 
 155mm:
 	ROF: 75
 	Range: 8
 	MinRange: 2
-	Report: MORTAR1
+	Report: MORTAR1.WAV
 	Projectile: Bullet
 		Speed: 20
 		High: true
@@ -391,7 +391,7 @@ FakeMissile:
 			Concrete: 100%
 		Explosion: large_explosion
 		WaterExplosion: large_splash
-		ImpactSound: explsml2
+		ImpactSound: EXPLSML2.WAV
 		InfDeath: 3
 		SmudgeType: SandCrater, RockCrater
 		Damage: 100
@@ -399,7 +399,7 @@ FakeMissile:
 Sound:
 	ROF: 100
 	Range: 8.5
-	Report: SONIC1
+	Report: SONIC1.WAV
 	Projectile: LaserZap
 		BeamWidth: 2
 		HitAnim: laserfire
@@ -419,7 +419,7 @@ ChainGun:
 	ROF: 10
 	Range: 5
 	MinRange: 1
-	Report: 20MMGUN1
+	Report: 20MMGUN1.WAV
 	Projectile: Bullet
 		Speed: 100
 		High: true
@@ -437,7 +437,7 @@ ChainGun:
 Heal:
 	ROF: 160
 	Range: 4
-	Report: HEAL2
+	Report:
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -453,7 +453,7 @@ Heal:
 WormJaw:
 	ROF: 10
 	Range: 3
-	Report: WORM
+	Report: WORM.WAV
 	Warhead:
 		Spread: 5
 		Versus: 
@@ -478,7 +478,7 @@ ParaBomb:
 		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 500
-		ImpactSound: EXPLLG3
+		ImpactSound: EXPLLG3.WAV
 
 Napalm:
 	ROF: 2
@@ -494,6 +494,6 @@ Napalm:
 			Concrete: 70%
 		InfDeath: 4
 		Explosion: napalm
-		ImpactSound: NAPALM1
+		ImpactSound: NAPALM1.WAV
 		SmudgeType: Crater
 		Damage: 300

mods/ra/weapons.yaml

@@ -1,7 +1,7 @@
 Colt45:
 	ROF: 5
 	Range: 7
-	Report: GUN5
+	Report: GUN5.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -18,14 +18,14 @@ Colt45:
 ZSU-23:
 	ROF: 10
 	Range: 10
-	Report: AACANON3
+	Report: AACANON3.AUD
 	ValidTargets: Air
 	Projectile: Bullet
 		Speed: 100
 		High: true
 	Warhead:
 		Spread: 5
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -36,12 +36,12 @@ ZSU-23:
 Vulcan:
 	ROF: 30
 	Range: 6
-	Report: GUN13
+	Report: GUN13.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead@1:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -51,7 +51,7 @@ Vulcan:
 		Damage: 10
 	Warhead@2:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -62,7 +62,7 @@ Vulcan:
 		Delay: 2
 	Warhead@3:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -73,7 +73,7 @@ Vulcan:
 		Delay: 4
 	Warhead@4:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -84,7 +84,7 @@ Vulcan:
 		Delay: 6
 	Warhead@5:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -95,7 +95,7 @@ Vulcan:
 		Delay: 8
 	Warhead@6:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -109,7 +109,7 @@ Maverick:
 	ROF: 30
 	Range: 9
 	MinRange: 3
-	Report: MISSILE7
+	Report: MISSILE7.AUD
 	Burst: 2
 	BurstDelay: 7
 	ValidTargets: Ground
@@ -119,7 +119,6 @@ Maverick:
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Inaccuracy: 12
 		Image: DRAGON
@@ -127,7 +126,7 @@ Maverick:
 		RangeLimit: 60
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -159,7 +158,7 @@ FireballLauncher:
 		WaterExplosion: napalm
 		InfDeath: 5
 		SmudgeType: Scorch
-		ImpactSound: firebl3
+		ImpactSound: firebl3.aud
 		Damage: 150
 
 Flamer:
@@ -175,7 +174,7 @@ Flamer:
 		Inaccuracy: 20
 	Warhead:
 		Spread: 8
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 100%
 			Light: 60%
@@ -185,14 +184,14 @@ Flamer:
 		WaterExplosion: small_napalm
 		InfDeath: 5
 		SmudgeType: Scorch
-		ImpactSound: firebl3
+		ImpactSound: firebl3.aud
 		Damage: 8
 
 ChainGun:
 	ROF: 10
 	Range: 5
 	MinRange: 1
-	Report: GUN13
+	Report: GUN13.AUD
 	Projectile: Bullet
 		Speed: 100
 		High: true
@@ -212,13 +211,13 @@ ChainGun.Yak:
 	ROF: 3
 	Range: 5
 	MinRange: 3
-	Report: GUN13
+	Report: GUN13.AUD
 	Projectile: Bullet
 		Speed: 100
 		High: true
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -231,12 +230,12 @@ ChainGun.Yak:
 Pistol:
 	ROF: 7
 	Range: 3
-	Report: GUN27
+	Report: GUN27.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
@@ -248,12 +247,12 @@ Pistol:
 M1Carbine:
 	ROF: 20
 	Range: 5
-	Report: GUN11
+	Report: GUN11.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 25%
 			Light: 30%
 			Heavy: 10%
@@ -265,7 +264,7 @@ M1Carbine:
 Dragon:
 	ROF: 50
 	Range: 5
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	ValidTargets: Ground
 	Projectile: Missile
 		Speed: 25
@@ -281,7 +280,7 @@ Dragon:
 		RangeLimit: 35
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 10%
 			Wood: 75%
 			Light: 35%
@@ -291,12 +290,12 @@ Dragon:
 		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 50
-		ImpactSound: kaboom12
+		ImpactSound: kaboom12.aud
-		
+
 HellfireAG:
 	ROF: 60
 	Range: 4
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	Burst: 2
 	BurstDelay: 1
 	ValidTargets: Ground
@@ -306,7 +305,6 @@ HellfireAG:
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
@@ -314,7 +312,7 @@ HellfireAG:
 		RangeLimit: 20
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -328,9 +326,9 @@ HellfireAG:
 HellfireAA:
 	ROF: 60
 	Range: 4
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	Burst: 2
-	BurstDelay: 1	
+	BurstDelay: 1
 	ValidTargets: Air
 	Projectile: Missile
 		Speed: 45
@@ -338,7 +336,6 @@ HellfireAA:
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
@@ -346,7 +343,7 @@ HellfireAA:
 		RangeLimit: 20
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -355,12 +352,12 @@ HellfireAA:
 		WaterExplosion: med_splash
 		InfDeath: 4
 		SmudgeType: Crater
-		Damage: 40		
+		Damage: 40
 
 Grenade:
 	ROF: 60
 	Range: 4
-	Report: grenade1
+	Report: grenade1.aud
 	Projectile: Bullet
 		Speed: 5
 		High: true
@@ -379,18 +376,18 @@ Grenade:
 		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 60
-		ImpactSound: kaboom12
+		ImpactSound: kaboom12.aud
 
 25mm:
 	ROF: 13
 	Range: 4
-	Report: CANNON2
+	Report: CANNON2.AUD
 	Projectile: Bullet
 		Speed: 50
 		Image: 50CAL
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 40%
 			Heavy: 40%
@@ -404,13 +401,13 @@ Grenade:
 90mm:
 	ROF: 50
 	Range: 4.75
-	Report: CANNON1
+	Report: CANNON1.AUD
 	Projectile: Bullet
 		Speed: 40
 		Image: 120MM
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 20%
 			Wood: 75%
 			Light: 75%
@@ -424,7 +421,7 @@ Grenade:
 105mm:
 	ROF: 70
 	Range: 4.75
-	Report: CANNON1
+	Report: CANNON1.AUD
 	Burst: 2
 	BurstDelay: 4
 	Projectile: Bullet
@@ -432,7 +429,7 @@ Grenade:
 		Image: 120MM
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 20%
 			Wood: 75%
 			Light: 75%
@@ -446,14 +443,14 @@ Grenade:
 120mm:
 	ROF: 90
 	Range: 4.75
-	Report: CANNON1
+	Report: CANNON1.AUD
 	Burst: 2
 	Projectile: Bullet
 		Speed: 40
 		Image: 120MM
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 20%
 			Wood: 75%
 			Light: 75%
@@ -467,13 +464,13 @@ Grenade:
 TurretGun:
 	ROF: 30
 	Range: 7
-	Report: TURRET1
+	Report: TURRET1.AUD
 	Projectile: Bullet
 		Speed: 40
 		Image: 120MM
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 20%
 			Wood: 50%
 			Light: 75%
@@ -487,7 +484,7 @@ TurretGun:
 MammothTusk:
 	ROF: 60
 	Range: 8
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	Burst: 2
 	ValidTargets: Ground, Air
 	Projectile: Missile
@@ -496,7 +493,6 @@ MammothTusk:
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
@@ -504,7 +500,7 @@ MammothTusk:
 		RangeLimit: 40
 	Warhead:
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
@@ -519,7 +515,7 @@ MammothTusk:
 	ROF: 85
 	Range: 14
 	MinRange: 3
-	Report: TANK5
+	Report: TANK5.AUD
 	Projectile: Bullet
 		Speed: 12
 		High: true
@@ -529,7 +525,7 @@ MammothTusk:
 		ContrailLength: 30
 	Warhead:
 		Spread: 10
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
@@ -544,13 +540,13 @@ MammothTusk:
 M60mg:
 	ROF: 30
 	Range: 4
-	Report: PILLBOX1
+	Report: PILLBOX1.AUD
 	Burst: 5
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			Wood: 10%
 			Light: 30%
 			Heavy: 10%
@@ -571,7 +567,7 @@ Napalm:
 		Arm: 24
 	Warhead:
 		Spread: 4
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -580,13 +576,13 @@ Napalm:
 		WaterExplosion: med_splash
 		InfDeath: 5
 		SmudgeType: Scorch
-		ImpactSound: firebl3
+		ImpactSound: firebl3.aud
 		Damage: 100
 
 CrateNapalm:
 	Warhead:
 		Spread: 4
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -610,14 +606,14 @@ CrateExplosion:
 		Explosion: self_destruct
 		WaterExplosion: self_destruct
 		InfDeath: 4
-		ImpactSound: kaboom15
+		ImpactSound: kaboom15.aud
 
 CrateNuke:
 	Warhead@impact:
 		Damage: 1000
 		Spread: 6
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -625,27 +621,27 @@ CrateNuke:
 		Explosion: nuke
 		WaterExplosion: nuke
 		InfDeath: 5
-		ImpactSound: kaboom1
+		ImpactSound: kaboom1.aud
 	Warhead@areanuke:
 		DamageModel: PerCell
 		Damage: 250
 		SmudgeType: Scorch
 		Size: 5,4
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
 		Delay: 4
 		InfDeath: 5
-		ImpactSound: kaboom22
+		ImpactSound: kaboom22.aud
 
 TeslaZap:
 	ROF: 3
 	Charges: true
 	Range: 8.5
-	Report: TESLA1
+	Report: TESLA1.AUD
 	Projectile: TeslaZap
 	Warhead:
 		Spread: 1
@@ -657,14 +653,13 @@ TeslaZap:
 Nike:
 	ROF: 15
 	Range: 7.5
-	Report: MISSILE1
+	Report: MISSILE1.AUD
 	ValidTargets: Air
 	Projectile: Missile
 		Arm: 3
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Image: MISSILE
 		ROT: 25
@@ -672,7 +667,7 @@ Nike:
 		Speed: 40
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 0%
 			Light: 90%
@@ -686,14 +681,13 @@ Nike:
 RedEye:
 	ROF: 50
 	Range: 7.5
-	Report: MISSILE1
+	Report: MISSILE1.AUD
 	ValidTargets: Air
 	Projectile: Missile
 		Arm: 3
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Image: MISSILE
 		ROT: 20
@@ -701,7 +695,7 @@ RedEye:
 		Speed: 35
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
@@ -714,9 +708,8 @@ RedEye:
 8Inch:
 	ROF: 250
 	Range: 16
-#	MinRange: 8
 	Burst: 2
-	Report: TURRET1
+	Report: TURRET1.AUD
 	Projectile: Bullet
 		Speed: 12
 		High: true
@@ -726,7 +719,7 @@ RedEye:
 		ContrailLength: 30
 	Warhead:
 		Spread: 5
-		Versus: 
+		Versus:
 			None: 60%
 			Wood: 75%
 			Light: 60%
@@ -736,15 +729,14 @@ RedEye:
 		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 250
-		ImpactSound: kaboom12
+		ImpactSound: kaboom12.aud
-		WaterImpactSound: splash9
+		WaterImpactSound: splash9.aud
 
 SubMissile:
 	ROF: 300
 	Range: 16
-#	MinRange: 8
 	Burst: 2
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	Projectile: Bullet
 		Speed: 6
 		High: true
@@ -755,7 +747,7 @@ SubMissile:
 		ContrailLength: 30
 	Warhead:
 		Spread: 10
-		Versus: 
+		Versus:
 			None: 40%
 			Light: 30%
 			Heavy: 30%
@@ -764,13 +756,13 @@ SubMissile:
 		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 300
-		ImpactSound: kaboom12
+		ImpactSound: kaboom12.aud
-		WaterImpactSound: splash9
+		WaterImpactSound: splash9.aud
 
 Stinger:
 	ROF: 60
 	Range: 9
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	Burst: 2
 	BurstDelay: 0
 	ValidTargets: Ground, Air
@@ -779,7 +771,6 @@ Stinger:
 		High: true
 		Shadow: false
 		Proximity: true
-#		Trail: smokey
 		ContrailLength: 10
 		Image: DRAGON
 		ROT: 20
@@ -788,7 +779,7 @@ Stinger:
 		Speed: 20
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -802,7 +793,7 @@ Stinger:
 TorpTube:
 	ROF: 100
 	Range: 9
-	Report: TORPEDO1
+	Report: TORPEDO1.AUD
 	ValidTargets: Water, Underwater
 	Underwater: yes
 	Burst: 2
@@ -816,7 +807,7 @@ TorpTube:
 		RangeLimit: 160
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -829,13 +820,13 @@ TorpTube:
 2Inch:
 	ROF: 60
 	Range: 5.5
-	Report: CANNON2
+	Report: CANNON2.AUD
 	Projectile: Bullet
 		Speed: 25
 		Image: 120MM
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -858,7 +849,7 @@ DepthCharge:
 		Inaccuracy: 3
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -871,12 +862,12 @@ DepthCharge:
 ParaBomb:
 	ROF: 10
 	Range: 4.5
-	Report: CHUTE1
+	Report: CHUTE1.AUD
 	Projectile: GravityBomb
 		Image: PARABOMB
 	Warhead:
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
@@ -886,15 +877,15 @@ ParaBomb:
 		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 500
-		ImpactSound: kaboom15
+		ImpactSound: kaboom15.aud
 
 DogJaw:
 	ROF: 10
 	Range: 3
-	Report: DOGG5P
+	Report: DOGG5P.AUD
 	Warhead:
 		Spread: 5
-		Versus: 
+		Versus:
 			Wood: 0%
 			Light: 0%
 			Heavy: 0%
@@ -905,7 +896,7 @@ DogJaw:
 Heal:
 	ROF: 80
 	Range: 4
-	Report: HEAL2
+	Report: HEAL2.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -921,7 +912,7 @@ Heal:
 Repair:
 	ROF: 80
 	Range: 4
-	Report: FIXIT1
+	Report: FIXIT1.AUD
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -938,7 +929,7 @@ Repair:
 SilencedPPK:
 	ROF: 80
 	Range: 2.5
-	Report: silppk
+	Report: silppk.aud
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
@@ -956,7 +947,7 @@ SCUD:
 	ROF: 280
 	Range: 10
 	MinRange: 3
-	Report: MISSILE1
+	Report: MISSILE1.AUD
 	Projectile: Bullet
 		Speed: 10
 		Arm: 10
@@ -979,15 +970,15 @@ SCUD:
 		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 600
-		ImpactSound: firebl3
+		ImpactSound: firebl3.aud
-		WaterImpactSound: splash9
+		WaterImpactSound: splash9.aud
 
 Atomic:
 	Warhead@impact:
 		Damage: 1000
 		Spread: 6
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -995,26 +986,26 @@ Atomic:
 		Explosion: nuke
 		WaterExplosion: nuke
 		InfDeath: 5
-		ImpactSound: kaboom1
+		ImpactSound: kaboom1.aud
 	Warhead@areanuke1:
 		DamageModel: PerCell
 		Damage: 180
 		Size: 2,1
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
 		Delay: 5
 		InfDeath: 5
-		ImpactSound: kaboom22
+		ImpactSound: kaboom22.aud
 	Warhead@areanuke2:
 		DamageModel: PerCell
 		Damage: 180
 		Size: 3,2
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1026,7 +1017,7 @@ Atomic:
 		Damage: 180
 		Size: 4,3
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1039,7 +1030,7 @@ Atomic:
 		SmudgeType: Scorch
 		Size: 5,4
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1052,7 +1043,7 @@ MiniNuke:
 		Damage: 800
 		Spread: 6
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1060,13 +1051,13 @@ MiniNuke:
 		Explosion: nuke
 		WaterExplosion: nuke
 		InfDeath: 5
-		ImpactSound: kaboom1
+		ImpactSound: kaboom1.aud
 	Warhead@areanuke1:
 		DamageModel: PerCell
 		Damage: 180
 		Size: 2,1
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1079,7 +1070,7 @@ MiniNuke:
 		Damage: 180
 		Size: 3,2
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1092,7 +1083,7 @@ MiniNuke:
 		Size: 4,3
 		SmudgeType: Scorch
 		Ore: true
-		Versus: 
+		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
@@ -1112,26 +1103,26 @@ UnitExplode:
 		Explosion: self_destruct
 		WaterExplosion: large_splash
 		InfDeath: 4
-		ImpactSound: kaboom22
+		ImpactSound: kaboom22.aud
 
 UnitExplodeSmall:
 	Warhead:
 		Damage: 40
 		Spread: 10
-		Versus: 
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
 		Explosion: large_explosion
 		InfDeath: 4
-		ImpactSound: kaboom15
+		ImpactSound: kaboom15.aud
 
 BarrelExplode:
 	Warhead:
 		Damage: 500
 		Spread: 10
-		Versus: 
+		Versus:
 			None: 120%
 			Wood: 200%
 			Light: 50%
@@ -1139,14 +1130,14 @@ BarrelExplode:
 			Concrete: 10%
 		Explosion: napalm
 		InfDeath: 4
-		ImpactSound: firebl3
+		ImpactSound: firebl3.aud
 		SmudgeType: Scorch
 		Delay: 5
 		Size: 2,1
 
 Crush:
 	Warhead:
-		ImpactSound: squishy2
+		ImpactSound: squishy2.aud
 		Damage: 100
 
 ATMine:
@@ -1156,7 +1147,7 @@ ATMine:
 			None: 0%
 			Wood: 0%
 			Concrete: 0%
-		ImpactSound: mineblo1
+		ImpactSound: mineblo1.aud
 		Explosion: large_explosion
 
 APMine:
@@ -1173,14 +1164,14 @@ APMine:
 
 Demolish:
 	Warhead:
-		ImpactSound: kaboom25
+		ImpactSound: kaboom25.aud
 		Explosion: building
 
 PortaTesla:
 	ROF: 70
 	Range: 3.5
-	Report: TESLA1
+	Report: TESLA1.AUD
-#	Report: SHKTROP1
+#	Report: SHKTROP1.AUD
 	Charges: yes
 	Projectile: TeslaZap
 	Warhead:
@@ -1191,7 +1182,7 @@ PortaTesla:
 TTankZap:
 	ROF: 120
 	Range: 7
-	Report: TESLA1
+	Report: TESLA1.AUD
 	Charges: yes
 	Projectile: TeslaZap
 	Warhead:
@@ -1202,7 +1193,7 @@ TTankZap:
 FLAK-23:
 	ROF: 10
 	Range: 8
-	Report: AACANON3
+	Report: AACANON3.AUD
 	ValidTargets: Air,Ground
 	Projectile: Bullet
 		Speed: 100
@@ -1219,7 +1210,7 @@ FLAK-23:
 		Damage: 20
 
 Sniper:
-	Report: GUN5
+	Report: GUN5.AUD
 	ROF: 70
 	Range: 10
 	Projectile: Bullet
@@ -1237,7 +1228,7 @@ Sniper:
 ChronoTusk:
 	ROF: 60
 	Range: 6
-	Report: MISSILE6
+	Report: MISSILE6.AUD
 	ValidTargets: Ground
 	Projectile: Missile
 		Speed: 35