Merge pull request #8012 from reaperrr/voiceset

Extracted actor Voices from Selectable into own Voiced trait

mods/ts/rules/aircraft.yaml

@@ -207,7 +207,8 @@ SCRIN:
 		Prerequisites: ~nahpad, natech
 	Selectable:
 		Bounds: 30,24
-		Voice: Scrin
+	Voiced:
+		VoiceSet: Scrin
 	Plane:
 		MaximumPitch: 90
 		ROT: 3

mods/ts/rules/civilian-infantry.yaml

@@ -6,7 +6,8 @@ WEEDGUY:
 		Name: Chem Spray Infantry
 	Selectable:
 		Bounds: 12,17,0,-6
-		Voice: Weed
+	Voiced:
+		VoiceSet: Weed
 	Mobile:
 		Speed: 42
 	Health:
@@ -35,7 +36,8 @@ UMAGON:
 		Name: Umagon
 	Selectable:
 		Bounds: 12,17,0,-6
-		Voice: Umagon
+	Voiced:
+		VoiceSet: Umagon
 	Mobile:
 		Speed: 71
 	Health:
@@ -65,8 +67,9 @@ CHAMSPY:
 		Cost: 700
 	DisguiseToolTip:
 		Name: Chameleon Spy
+	Voiced:
+		VoiceSet: Spy
 	Selectable:
-		Voice: Spy
 		Bounds: 12,17,0,-9
 	Health:
 		HP: 120
@@ -99,7 +102,8 @@ MUTANT:
 		Name: Mutant
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Mutant
+	Voiced:
+		VoiceSet: Mutant
 	Health:
 		HP: 50
 	PoisonedByTiberium:
@@ -130,7 +134,8 @@ MWMN:
 		Name: Mutant Soldier
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: CivilianFemale
+	Voiced:
+		VoiceSet: CivilianFemale
 	Health:
 		HP: 50
 	PoisonedByTiberium:
@@ -161,7 +166,8 @@ MUTANT3:
 		Name: Mutant Sergeant
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Mutant
+	Voiced:
+		VoiceSet: Mutant
 	Health:
 		HP: 50
 	PoisonedByTiberium:
@@ -192,7 +198,8 @@ TRATOS:
 		Name: Tratos
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Tratos
+	Voiced:
+		VoiceSet: Tratos
 	Health:
 		HP: 200
 	PoisonedByTiberium:
@@ -221,7 +228,8 @@ OXANNA:
 		Name: Oxanna
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Oxanna
+	Voiced:
+		VoiceSet: Oxanna
 	Health:
 		HP: 50
 	Mobile:
@@ -248,7 +256,8 @@ SLAV:
 		Name: Slavick
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Slavick
+	Voiced:
+		VoiceSet: Slavick
 	Health:
 		HP: 300
 	Mobile:
@@ -284,8 +293,8 @@ DOGGIE:
 		Range: 4c0
 	Mobile:
 		Speed: 113
-	Selectable:
-		Voice: Fiend
+	Voiced:
+		VoiceSet: Fiend
 	TargetableUnit:
 		TargetTypes: Ground
 	Armament:
@@ -314,8 +323,8 @@ VISSML:
 		Speed: 113
 		ROT: 16
 	-Crushable:
-	Selectable:
-		Voice: Fiend
+	Voiced:
+		VoiceSet: Fiend
 	TargetableUnit:
 		TargetTypes: Ground
 	-AutoTarget:
@@ -342,8 +351,8 @@ VISLRG:
 		Speed: 113
 		ROT: 16
 	-Crushable:
-	Selectable:
-		Voice: Fiend
+	Voiced:
+		VoiceSet: Fiend
 	TargetableUnit:
 		TargetTypes: Ground
 	Armament:

mods/ts/rules/defaults.yaml

@@ -185,7 +185,8 @@
 	SelectionDecorations:
 		Palette: pips
 	Selectable:
-		Voice: Infantry
+	Voiced:
+		VoiceSet: Infantry
 	TargetableUnit:
 		TargetTypes: Ground, Infantry
 	RenderSprites:
@@ -250,8 +251,9 @@
 ^CivilianInfantry:
 	Inherits: ^Infantry
 	Selectable:
-		Voice: Civilian
 		Bounds: 12,17,0,-9
+	Voiced:
+		VoiceSet: Civilian
 	Valued:
 		Cost: 10
 	Tooltip:
@@ -281,10 +283,11 @@
 			Tiberium: 80
 			BlueTiberium: 80
 		ROT: 5
+	Selectable:
 	SelectionDecorations:
 		Palette: pips
-	Selectable:
-		Voice: Vehicle
+	Voiced:
+		VoiceSet: Vehicle
 	TargetableUnit:
 		TargetTypes: Ground, Vehicle
 	Repairable:
@@ -365,10 +368,11 @@
 			Tiberium: 80
 			BlueTiberium: 80
 		ROT: 5
+	Selectable:
 	SelectionDecorations:
 		Palette: pips
-	Selectable:
-		Voice: Vehicle
+	Voiced:
+		VoiceSet: Vehicle
 	TargetableUnit:
 		TargetTypes: Ground, Vehicle
 	Repairable:
@@ -442,10 +446,11 @@
 	TargetableAircraft:
 		TargetTypes: Air
 		GroundedTargetTypes: Ground
+	Selectable:
 	SelectionDecorations:
 		Palette: pips
-	Selectable:
-		Voice: Heli
+	Voiced:
+		VoiceSet: Heli
 	Helicopter:
 		RepairBuildings: gadept
 		RearmBuildings:

mods/ts/rules/gdi-infantry.yaml

@@ -44,7 +44,8 @@ MEDIC:
 		Prerequisites: ~gapile
 	Selectable:
 		Bounds: 12,17,0,-6
-		Voice: Medic
+	Voiced:
+		VoiceSet: Medic
 	Mobile:
 		Speed: 56
 	Health:

mods/ts/rules/gdi-vehicles.yaml

@@ -106,8 +106,9 @@ SMECH:
 		Weapon: AssaultCannon
 	RenderSprites:
 	WithInfantryBody:
+	Voiced:
+		VoiceSet: Mech
 	Selectable:
-		Voices: Mech
 		Bounds: 20, 32, 0, -8
 
 MMCH:

mods/ts/rules/nod-infantry.yaml

@@ -11,7 +11,8 @@ E3:
 		Description: Anti-tank infantry.\n  Strong vs Vehicles, Aircraft, Buildings\n  Weak vs Infantry
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Rocket
+	Voiced:
+		VoiceSet: Rocket
 	Health:
 		HP: 100
 	Mobile:
@@ -47,7 +48,8 @@ CYBORG:
 	-Crushable:
 	Selectable:
 		Bounds: 14,30,0,-7
-		Voice: Cyborg
+	Voiced:
+		VoiceSet: Cyborg
 	Mobile:
 		Speed: 56
 	Health:
@@ -88,7 +90,8 @@ CYC2:
 	-Crushable:
 	Selectable:
 		Bounds: 14,30,0,-7
-		Voice: CyborgCommando
+	Voiced:
+		VoiceSet: CyborgCommando
 	Mobile:
 		Speed: 56
 	Health:
@@ -126,7 +129,8 @@ MHIJACK:
 		Description: Hijacks enemy vehicles.\n  Unarmed
 	Selectable:
 		Bounds: 12,17,0,-9
-		Voice: Hijacker
+	Voiced:
+		VoiceSet: Hijacker
 	Health:
 		HP: 300
 	PoisonedByTiberium:

mods/ts/rules/nod-support.yaml

@@ -165,6 +165,8 @@ GATICK:
 		Type: Concrete
 	RevealsShroud:
 		Range: 5c0
+	Voiced:
+		VoiceSet: Vehicle
 	Turreted:
 		ROT: 6
 		InitialFacing: 128
@@ -215,8 +217,8 @@ GAARTY:
 		Type: Light
 	RevealsShroud:
 		Range: 9c0
-	Selectable:
-		Voice: Vehicle
+	Voiced:
+		VoiceSet: Vehicle
 	Turreted:
 		ROT: 5
 		InitialFacing: 128

mods/ts/rules/shared-infantry.yaml

@@ -49,7 +49,8 @@ ENGINEER:
 		Prerequisites: ~barracks
 	Selectable:
 		Bounds: 12,17,0,-6
-		Voice: Engineer
+	Voiced:
+		VoiceSet: Engineer
 	Mobile:
 		Speed: 56
 	Health: