Use c&c voices for all units

mods/cnc/mod.yaml

@@ -10,10 +10,7 @@ Packages:
 	mods/cnc/packages/general.mix
 	mods/cnc/packages/sounds.mix
 	mods/cnc/packages/transit.mix
-# Icons for each theatre
-	mods/cnc/packages/deseicnh.mix
 	mods/cnc/packages/tempicnh.mix
-	mods/cnc/packages/winticnh.mix
 	main.mix
 	redalert.mix
 	hires.mix
@@ -30,9 +27,9 @@ Packages:
 
 
 LegacyRules:
-	mods/cnc/minimal.ini: Dummy definitions to stop the game crashing
-	mods/cnc/weapons.ini: Weapons are still in the old format
-
+	mods/cnc/minimal.ini:	Minimal rules definitions
+	mods/cnc/weapons.ini:	Weapons are still in the old format
+	mods/cnc/voices.ini:	Voices are still in the old format
 Rules:
 	mods/ra/defaults.yaml:		Basic stuff
 	mods/cnc/system.yaml:		Player and world actors

mods/cnc/voices.ini

@@ -0,0 +1,34 @@
+[VoiceTypes]
+GenericVoice
+VehicleVoice
+CivilianMaleVoice
+CivilianFemaleVoice
+CommandoVoice
+
+;; explicit extension on voice clips overrides the normal `variants` mechanism
+[GenericVoice]
+SovietVariants=.v01,.v03
+AlliedVariants=.v01,.v03
+Select=await1,ready,report1,yessir1
+Move=ackno,affirm1,noprob,ritaway,roger,ugotit
+Die=nuyell1.aud,nuyell3.aud,nuyell4.aud,nuyell5.aud
+
+[VehicleVoice]
+SovietVariants=.v00,.v02
+AlliedVariants=.v00,.v02
+Select=vehic1,yessir1,report1,await1,unit1
+Move=ackno,affirm1,movout1
+
+[CivilianMaleVoice]
+Select=guyyeah1
+Move=guyokay1
+
+[CivilianFemaleVoice]
+Select=girlyeah
+Move=girlokay
+
+[CommandoVoice]
+Select=rokroll1,yeah1,yes1,yo1
+Move=cmon1,onit1,gotit1
+Attack=keepem1,laugh1,bombit1,lefty1
+Die=ramyell

mods/cnc/weapons.ini

@@ -30,44 +30,4 @@ SA
 Spread=3
 Verses=100%,50%,60%,25%,25%
 Explosion=2
-InfDeath=1
-
-[VoiceTypes]
-GenericVoice
-VehicleVoice
-EngineerVoice
-CivilianMaleVoice
-CivilianFemaleVoice
-CommandoVoice
-
-
-;; explicit extension on voice clips overrides the normal `variants` mechanism
-[GenericVoice]
-SovietVariants=.r01,.r03
-AlliedVariants=.v01,.v03
-Select=await1,ready,report1,yessir1
-Move=ackno,affirm1,noprob,overout,ritaway,roger,ugotit
-Die=dedman1.aud,dedman2.aud,dedman3.aud,dedman4.aud,dedman5.aud,dedman6.aud,dedman7.aud,dedman8.aud,dedman10.aud
-
-[VehicleVoice]
-SovietVariants=.r00,.r02
-AlliedVariants=.v00,.v02
-Select=vehic1,yessir1,report1,await1
-Move=ackno,affirm1
-
-[EngineerVoice]
-Select=eengin1,eyessir1
-Move=eaffirm1,emovout1
-Die=dedman1,dedman2,dedman3,dedman4,dedman5,dedman6,dedman7,dedman8,dedman10
-
-[CivilianMaleVoice]
-Select=guyyeah1
-Move=guyokay1
-
-[CivilianFemaleVoice]
-Select=girlyeah
-Move=girlokay
-
-[CommandoVoice]
-Select=girlyeah
-Move=girlokay
+InfDeath=1