Merge pull request #8012 from reaperrr/voiceset

Extracted actor Voices from Selectable into own Voiced trait

mods/d2k/rules/defaults.yaml

@@ -13,7 +13,6 @@
 		ROT: 5
 	SelectionDecorations:
 	Selectable:
-		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground, C4
 	Passenger:
@@ -52,6 +51,8 @@
 	MustBeDestroyed:
 	AnnounceOnSeen:
 		Notification: EnemyUnitsDetected
+	Voiced:
+		VoiceSet: VehicleVoice
 
 ^Tank:
 	AppearsOnRadar:
@@ -68,7 +69,6 @@
 		ROT: 5
 	SelectionDecorations:
 	Selectable:
-		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground, C4
 	Passenger:
@@ -107,6 +107,8 @@
 	MustBeDestroyed:
 	AnnounceOnSeen:
 		Notification: EnemyUnitsDetected
+	Voiced:
+		VoiceSet: VehicleVoice
 
 ^Husk:
 	Health:
@@ -190,7 +192,6 @@
 			Rough: 70
 	SelectionDecorations:
 	Selectable:
-		Voice: InfantryVoice
 	TargetableUnit:
 		TargetTypes: Ground
 	RenderSprites:
@@ -241,13 +242,14 @@
 	TerrainModifiesDamage:
 		TerrainModifier:
 			Rough: 80
+	Voiced:
+		VoiceSet: InfantryVoice
 
 ^Plane:
 	AppearsOnRadar:
 		UseLocation: yes
 	SelectionDecorations:
 	Selectable:
-		Voice: GenericVoice
 	TargetableAircraft:
 		TargetTypes: Air
 		GroundedTargetTypes: Ground
@@ -277,6 +279,8 @@
 	AnnounceOnSeen:
 		Notification: EnemyUnitsDetected
 	RenderUnit:
+	Voiced:
+		VoiceSet: GenericVoice
 
 ^Helicopter:
 	Inherits: ^Plane

mods/d2k/rules/infantry.yaml

@@ -37,7 +37,6 @@ engineer:
 		Description: Infiltrates and captures enemy structures\n  Strong vs Buildings\n  Weak vs Everything
 	Selectable:
 		Bounds: 12,17,0,0
-		Voice: EngineerVoice
 	Health:
 		HP: 25
 	Mobile:
@@ -52,6 +51,8 @@ engineer:
 	-AutoTarget:
 	AttractsWorms:
 		Intensity: 180
+	Voiced:
+		VoiceSet: EngineerVoice
 
 bazooka:
 	Inherits: ^Infantry
@@ -94,7 +95,6 @@ medic:
 		Description: Heals nearby infantry\n  Strong vs Nothing\n  Weak vs Everything
 	Selectable:
 		Bounds: 12,17,0,0
-		Voice: EngineerVoice
 	Health:
 		HP: 60
 	Mobile:
@@ -112,6 +112,8 @@ medic:
 	-AutoTarget:
 	AttractsWorms:
 		Intensity: 180
+	Voiced:
+		VoiceSet: EngineerVoice
 
 fremen:
 	Inherits: ^Infantry
@@ -126,7 +128,6 @@ fremen:
 		Prerequisites: ~barracks.atreides, palace, ~techlevel.high
 	Selectable:
 		Bounds: 12,17,0,0
-		Voice: FremenVoice
 	Mobile:
 		Speed: 53
 	Health:
@@ -151,6 +152,8 @@ fremen:
 		CloakSound: STEALTH1.WAV
 		UncloakSound: STEALTH2.WAV
 	-MustBeDestroyed:
+	Voiced:
+		VoiceSet: FremenVoice
 
 grenadier:
 	Inherits: ^Infantry
@@ -199,7 +202,6 @@ sardaukar:
 		Description: Elite asssault infantry\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery
 	Selectable:
 		Bounds: 12,17,0,0
-		Voice: GenericVoice
 	Health:
 		HP: 100
 	Mobile:
@@ -217,6 +219,8 @@ sardaukar:
 	AttackFrontal:
 	AttractsWorms:
 		Intensity: 180
+	Voiced:
+		VoiceSet: GenericVoice
 
 saboteur:
 	Inherits: ^Infantry
@@ -230,7 +234,6 @@ saboteur:
 		Name: Saboteur
 		Description: Sneaky infantry, armed with explosives\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
 	Selectable:
-		Voice: SaboteurVoice
 		Bounds: 12,17,0,0
 	Health:
 		HP: 100
@@ -243,4 +246,6 @@ saboteur:
 	-AutoTarget:
 	AttractsWorms:
 		Intensity: 120
+	Voiced:
+		VoiceSet: SaboteurVoice