Merge pull request #3510 from Mailaender/d2k-stats

Fixed Dune 2000 combat stats and weapon sounds

mods/d2k/rules/defaults.yaml

@@ -33,6 +33,7 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	UpdatesPlayerStatistics:
 
 ^Tank:
 	AppearsOnRadar:
@@ -69,6 +70,7 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	UpdatesPlayerStatistics:
 
 ^Husk:
 	Health:
@@ -161,6 +163,7 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	UpdatesPlayerStatistics:
 
 ^Plane:
 	AppearsOnRadar:
@@ -181,6 +184,7 @@
 	GivesBounty:
 	DebugMuzzlePositions:
 	BodyOrientation:
+	UpdatesPlayerStatistics:
 
 ^Helicopter:
 	Inherits: ^Plane
@@ -229,3 +233,4 @@
 	Guardable:
 		Range: 3
 	BodyOrientation:
+	UpdatesPlayerStatistics:

mods/d2k/weapons.yaml

@@ -1,7 +1,7 @@
 LMG:
 	ROF: 20
 	Range: 5
-	Report: MGUN2
+	Report: MGUN2.WAV
 	Projectile: Bullet
 		Speed: 100
 		ContrailLength: 3
@@ -72,7 +72,7 @@ Sniper:
 Vulcan:
 	ROF: 30
 	Range: 5.75
-	Report: VULCAN.WAV
+	Report: VULCAN.AUD # TODO: fallback to RA
 	ValidTargets: Ground, Air
 	Projectile: Bullet
 		Speed: 100

mods/d2k/weapons/defaults.yaml

@@ -5,10 +5,10 @@
 ### Warheads
 
 W_Bullets:	# Machine Guns
-	Report: MGUN2	#machine gun burst sound
+	Report: MGUN2.WAV	#machine gun burst sound
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 75%
 			Light: 40%
@@ -20,7 +20,7 @@ W_Bullets:	# Machine Guns
 W_Bazooka:
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 8%
 			Wood: 45%
 			Light: 70%
@@ -29,12 +29,12 @@ W_Bazooka:
 		InfDeath: 4
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		ImpactSound: kaboom12
+		ImpactSound: kaboom12.aud # TODO: fallback to RA
 
 W_HE:			# Grenadier, siege tank
 	Warhead:
 		Spread: 12
-		Versus: 
+		Versus:
 			None: 125%
 			Wood: 70%
 			Light: 30%
@@ -50,7 +50,7 @@ W_HE:			# Grenadier, siege tank
 W_GT_AT:	# Sardaukar & Fremen's longer range weapons
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 100%
@@ -59,27 +59,27 @@ W_GT_AT:	# Sardaukar & Fremen's longer range weapons
 		InfDeath: 4
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		ImpactSound: kaboom12
+		ImpactSound: kaboom12.aud # TODO: fallback to RA
 		SmudgeType: SandCrater, RockCrater
 
 W_AT:		# Tank shells, gun turret
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 20%
 			Wood: 60%
 			Light: 100%
 			Heavy: 75%
 			Concrete: 50%
 		Explosion: med_explosion
-		ImpactSound: kaboom30
+		ImpactSound: kaboom30.aud # TODO: fallback to RA
 		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 
 W_AT_Mis:	# Rocket Launcher, tower missile
 	Warhead:
 		Spread: 8
-		Versus: 
+		Versus:
 			None: 15%
 			Wood: 65%
 			Light: 90%
@@ -88,13 +88,13 @@ W_AT_Mis:	# Rocket Launcher, tower missile
 		InfDeath: 4
 		Explosion: large_explosion
 		WaterExplosion: med_splash
-		ImpactSound: explsml1
+		ImpactSound: explsml1.wav
 		SmudgeType: SandCrater, RockCrater
 
-W_Deviate
+W_Deviate:
 	Warhead:
 		Spread: 8
-		Versus: 
+		Versus:
 			None: 20%
 			Wood: 20%
 			Light: 20%
@@ -103,10 +103,10 @@ W_Deviate
 		Explosion: med_explosion
 		WaterExplosion: med_splash
 
-W_Sonic
+W_Sonic:
 	Warhead:
 		Spread: 6
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 100%
 			Light: 100%
@@ -118,7 +118,7 @@ W_Sonic
 W_Plasma:
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 100%
 			Light: 60%
@@ -141,7 +141,7 @@ P_Bullets:	#from M60mg
 		ContrailUsePlayerColor: true
 
 P_OneShot:	#from Sniper
-	Report: RIFLE
+	Report: RIFLE.AUD # TODO: fallback to RA
 	Projectile: Bullet
 		Speed: 150
 		ContrailLength: 6

mods/d2k/weapons/explosions.yaml

@@ -1,11 +1,11 @@
 Crush:
 	Warhead:
-		ImpactSound: CRUSH1
+		ImpactSound: CRUSH1.WAV
 		Damage: 100
 
 Demolish:
 	Warhead:
-		ImpactSound: EXPLLG2
+		ImpactSound: EXPLLG2.WAV
 		Explosion: building
 
 Atomic:
@@ -20,7 +20,7 @@ Atomic:
 			Concrete: 50%
 		Explosion: nuke
 		InfDeath: 5
-		ImpactSound: EXPLLG2
+		ImpactSound: EXPLLG2.WAV
 
 CrateNuke:
 	Warhead:
@@ -34,7 +34,7 @@ CrateNuke:
 			Concrete: 50%
 		Explosion: nuke
 		InfDeath: 5
-		ImpactSound: EXPLLG2
+		ImpactSound: EXPLLG2.WAV
 
 CrateExplosion:
 	Warhead:
@@ -48,7 +48,7 @@ CrateExplosion:
 		Explosion: building
 		WaterExplosion: building
 		InfDeath: 4
-		ImpactSound: EXPLSML4
+		ImpactSound: EXPLSML4.WAV
 
 UnitExplode:
 	Warhead:
@@ -62,7 +62,7 @@ UnitExplode:
 		Explosion: building
 		WaterExplosion: large_splash
 		InfDeath: 4
-		ImpactSound: EXPLMD1
+		ImpactSound: EXPLMD1.WAV
 
 UnitExplodeSmall:
 	Warhead:
@@ -75,7 +75,7 @@ UnitExplodeSmall:
 			Heavy: 25%
 		Explosion: self_destruct
 		InfDeath: 4
-		ImpactSound: EXPLHG1, EXPLLG1, EXPLMD1, EXPLSML4
+		ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV
 
 UnitExplodeTiny:
 	Warhead:
@@ -88,7 +88,7 @@ UnitExplodeTiny:
 			Heavy: 25%
 		Explosion: med_explosion
 		InfDeath: 4
-		ImpactSound: EXPLMD2, EXPLSML1, EXPLSML2, EXPLSML3
+		ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV
 
 UnitExplodeScale:
 	Warhead:
@@ -101,5 +101,5 @@ UnitExplodeScale:
 			Heavy: 25%
 		Explosion: building
 		InfDeath: 4
-		ImpactSound: EXPLLG2, EXPLLG3, EXPLLG5
+		ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV