Reimplement many SFX for neutrals/heroes/etc; Fix grouped conditions in crigs

mpq/arr/sfxdata.txt

@@ -1856,7 +1856,7 @@ Magister Yes 01
 Magister Yes 02
 Magister Yes 03
 Magister Yes 04
-unused
+Duke Battlecruiser Ready 01
 Azazel What 01
 Azazel What 02
 Azazel What 03
@@ -2765,87 +2765,87 @@ Izirokor Under Attack 01
 Izirokor Under Attack 02
 Penumbra Weaponhit 01
 Penumbra Weaponhit 02
-Extended Sound #1
+Paladin Selected 01
-Extended Sound #1
+Paladin Selected 02
-Extended Sound #1
+Paladin Selected 03
-Extended Sound #1
+Paladin Selected 04
-Extended Sound #1
+Paladin Order Passive 01
-Extended Sound #1
+Paladin Order Passive 02
-Extended Sound #1
+Paladin Order Passive 03
-Extended Sound #1
+Paladin Order Passive 04
-Extended Sound #1
+Cuirass Weaponfire 01
-Extended Sound #1
+Cuirass Weaponfire 02
-Extended Sound #1
+Salamander Weaponfire 01
-Extended Sound #1
+Salamander Weaponfire 02
-Extended Sound #1
+Salamander Weaponfire 03
-Extended Sound #1
+Centaur Weaponfire A 01
-Extended Sound #1
+Centaur Weaponfire A 02
-Extended Sound #1
+Centaur Weaponfire A 03
-Extended Sound #1
+Apostle Weaponfire 01
-Extended Sound #1
+Apostle Weaponfire 02
-Extended Sound #1
+Apostle Weaponfire 03
-Extended Sound #1
+Apostle Weaponfire 04
-Extended Sound #1
+Apostle Weaponfire 05
-Extended Sound #1
+Savant Siphon 01
-Extended Sound #1
+Savant Siphon 02
-Extended Sound #1
+Savant Siphon 03
-Extended Sound #1
+Savant Siphon 04
-Extended Sound #1
+Savant Siphon 05
-Extended Sound #1
+Fenix Dracadin Ready 01
-Extended Sound #1
+Fenix Zealot Ready 01
-Extended Sound #1
+Tassadar Ready 01
-Extended Sound #1
+Stargate Selected 01
-Extended Sound #1
+Hierophant Selected 01
-Extended Sound #1
+Hierophant Selected 02
-Extended Sound #1
+Hierophant Selected 03
-Extended Sound #1
+Hierophant Selected 04
-Extended Sound #1
+Hierophant Order Passive 01
-Extended Sound #1
+Hierophant Order Passive 02
-Extended Sound #1
+Hierophant Order Passive 03
-Extended Sound #1
+Hierophant Order Passive 04
-Extended Sound #1
+Hierophant Under Attack 01
-Extended Sound #1
+Hierophant Under Attack 02
-Extended Sound #1
+Hierophant Under Attack 03
-Extended Sound #1
+Cyprian Selected 01
-Extended Sound #1
+Cyprian Selected 02
-Extended Sound #1
+Cyprian Selected 03
-Extended Sound #1
+Cyprian Selected 04
-Extended Sound #1
+Cyprian Order Passive 01
-Extended Sound #1
+Cyprian Order Passive 02
-Extended Sound #1
+Cyprian Order Passive 03
-Extended Sound #1
+Cyprian Order Passive 04
-Extended Sound #1
+Cyprian Easter Egg 01
-Extended Sound #1
+Cyprian Easter Egg 02
-Extended Sound #1
+Cyprian Easter Egg 03
-Extended Sound #1
+Cyprian Easter Egg 04
-Extended Sound #1
+Goliath Death 01
-Extended Sound #1
+Paladin Charge 01
-Extended Sound #1
+Shaman Selected 01
-Extended Sound #1
+Shaman Selected 02
-Extended Sound #1
+Shaman Selected 03
-Extended Sound #1
+Shaman Selected 04
-Extended Sound #1
+Shaman Order Passive 01
-Extended Sound #1
+Shaman Order Passive 02
-Extended Sound #1
+Shaman Order Passive 03
-Extended Sound #1
+Shaman Order Passive 04
-Extended Sound #1
+Shaman Easter Egg 01
-Extended Sound #1
+Shaman Easter Egg 02
-Extended Sound #1
+Shaman Easter Egg 03
-Extended Sound #1
+Shaman Easter Egg 04
-Extended Sound #1
+Shaman Death 01
-Extended Sound #1
+Shaman Death 02
-Extended Sound #1
+Wyvern Weaponfire 01
-Extended Sound #1
+Wyvern Weaponfire 02
-Extended Sound #1
+Wyvern Death 01
-Extended Sound #1
+Legionnaire Selected 01
-Extended Sound #1
+Legionnaire Selected 02
-Extended Sound #1
+Legionnaire Selected 03
-Extended Sound #1
+Legionnaire Selected 04
-Extended Sound #1
+Legionnaire Order Passive 01
-Extended Sound #1
+Legionnaire Order Passive 02
-Extended Sound #1
+Legionnaire Order Passive 03
-Extended Sound #1
+Legionnaire Order Passive 04
-Extended Sound #1
+Raynor Maverick Ready 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -1856,7 +1856,7 @@ cm\p\magister\yes-01.wav
 cm\p\magister\yes-02.wav
 cm\p\magister\yes-03.wav
 cm\p\magister\yes-04.wav
-caw.wav
+terran\dukeb\rdy-01.wav
 cm\t\azazel\what-01.wav
 cm\t\azazel\what-02.wav
 cm\t\azazel\what-03.wav
@@ -2764,4 +2764,85 @@ cm\z\izirokor\agg-02.wav
 cm\z\izirokor\hlp-01.wav
 cm\z\izirokor\hlp-02.wav
 cm\t\penumbra\wh-01.wav
-cm\t\penumbra\wh-02.wav
+cm\t\penumbra\wh-02.wav
+cm\t\paladin\wht-01.wav
+cm\t\paladin\wht-02.wav
+cm\t\paladin\wht-03.wav
+cm\t\paladin\wht-04.wav
+cm\t\paladin\yes-01.wav
+cm\t\paladin\yes-02.wav
+cm\t\paladin\yes-03.wav
+cm\t\paladin\yes-04.wav
+cm\t\cuirass\wf-01.wav
+cm\t\cuirass\wf-02.wav
+cm\t\salamander\wf-01.wav
+cm\t\salamander\wf-02.wav
+cm\t\salamander\wf-03.wav
+cm\t\centaur\wf1-01.wav
+cm\t\centaur\wf1-02.wav
+cm\t\centaur\wf1-03.wav
+cm\t\apostle\wf-01.wav
+cm\t\apostle\wf-02.wav
+cm\t\apostle\wf-03.wav
+cm\t\apostle\wf-04.wav
+cm\t\apostle\wf-05.wav
+cm\t\savant\siphon-01.wav
+cm\t\savant\siphon-02.wav
+cm\t\savant\siphon-03.wav
+cm\t\savant\siphon-04.wav
+cm\t\savant\siphon-05.wav
+protoss\fenixd\rdy-01.wav
+protoss\fenixz\rdy-01.wav
+protoss\tassadar\rdy-01.wav
+cm\p\_building\stargate.wav
+cm\p\hierophant\wht-01.wav
+cm\p\hierophant\wht-02.wav
+cm\p\hierophant\wht-03.wav
+cm\p\hierophant\wht-04.wav
+cm\p\hierophant\yes-01.wav
+cm\p\hierophant\yes-02.wav
+cm\p\hierophant\yes-03.wav
+cm\p\hierophant\yes-04.wav
+cm\p\hierophant\hlp-01.wav
+cm\p\hierophant\hlp-02.wav
+cm\p\hierophant\hlp-03.wav
+cm\t\cyprian\wht-01.wav
+cm\t\cyprian\wht-02.wav
+cm\t\cyprian\wht-03.wav
+cm\t\cyprian\wht-04.wav
+cm\t\cyprian\yes-01.wav
+cm\t\cyprian\yes-02.wav
+cm\t\cyprian\yes-03.wav
+cm\t\cyprian\yes-04.wav
+cm\t\cyprian\ee-01.wav
+cm\t\cyprian\ee-02.wav
+cm\t\cyprian\ee-03.wav
+cm\t\cyprian\ee-04.wav
+terran\goliath\dth-01.wav
+cm\t\paladin\charge-01.wav
+cm\t\shaman\wht-01.wav
+cm\t\shaman\wht-02.wav
+cm\t\shaman\wht-03.wav
+cm\t\shaman\wht-04.wav
+cm\t\shaman\yes-01.wav
+cm\t\shaman\yes-02.wav
+cm\t\shaman\yes-03.wav
+cm\t\shaman\yes-04.wav
+cm\t\shaman\ee-01.wav
+cm\t\shaman\ee-02.wav
+cm\t\shaman\ee-03.wav
+cm\t\shaman\ee-04.wav
+cm\t\shaman\dth-01.wav
+cm\t\shaman\dth-02.wav
+cm\t\wyvern\wf-01.wav
+cm\t\wyvern\wf-02.wav
+cm\t\wyvern\dth-01.wav
+cm\p\legionnaire\wht-01.wav
+cm\p\legionnaire\wht-02.wav
+cm\p\legionnaire\wht-03.wav
+cm\p\legionnaire\wht-04.wav
+cm\p\legionnaire\yes-01.wav
+cm\p\legionnaire\yes-02.wav
+cm\p\legionnaire\yes-03.wav
+cm\p\legionnaire\yes-04.wav
+terran\raynorm\rdy-01.wav

mpq/scripts/iscript.txt

@@ -5753,7 +5753,7 @@ Goliath_Base_Local00:
 	goto              	Goliath_Base_Local00
 
 Goliath_Base_Death:
-	playsnd           	985 # Terran\Duran\TDnPss05.wav
+	playsnd           	2820 # Goliath death 01
 	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul			817 0 0 # Goliath Remains
@@ -23993,7 +23993,7 @@ CentaurUnused1:
 
 CentaurGndAttkInit:
 	wait              	1
-	playsndbtwn			686 688 # Centaur weapon 1 fire 01, 02, 03
+	playsndbtwn			2780 2782 # Centaur weapon 1 fire 01, 02, 03
 	imgol 				1034 0 0 # Centaur attack overlay (cm\terran\centaur-attack.grp)
 	attack
 	wait				1
@@ -24086,7 +24086,7 @@ CuirassGndAttkInit:
 	playfram			0x22
 	wait				1
 	playfram			0x99
-	playsndbtwn			681 682 # Cuirass weapon fire 01, 02
+	playsndbtwn			2775 2776 # Cuirass weapon fire 01, 02
 	attackwith			1
 	wait				1
 	playfram			0x22
@@ -24479,7 +24479,7 @@ AirAttkInit   	PaladinGndAttkInit
 Unused1       	PaladinUnused1
 GndAttkRpt    	PaladinGndAttkInit
 AirAttkRpt    	PaladinGndAttkInit
-CastSpell     	PaladinCastSpell
+CastSpell     	[NONE]
 GndAttkToIdle 	PaladinGndAttkToIdle
 AirAttkToIdle 	PaladinGndAttkToIdle
 Unused2       	[NONE]
@@ -24513,7 +24513,7 @@ PaladinLocal01:
 	goto				PaladinLocal00
 
 PaladinDeath:
-	playsnd           	985	# Terran\Duran\TDnPss05.wav
+	playsnd           	2820 # Goliath death 01
 	imgol             	333 0 0	# Explosion2 (Medium) (thingy\tBangL.grp)
 	wait              	3
 	lowsprul			273 0 0 # Terran Building Rubble Small
@@ -24534,7 +24534,7 @@ PaladinGndAttkInit:
 	playfram          	0x00
 	wait              	1
 	nobrkcodestart
-	playsnd           	988	# Terran\Duran\TDnPss08.wav
+	playsnd           	2821 # Paladin charge 01
 	goto				PaladinGndAttkRpt
 PaladinGndAttkRpt:
 	wait              	10
@@ -24569,39 +24569,6 @@ PaladinGndAttkRpt:
 PaladinGndAttkToIdle:
 	wait              	1
 	goto              	PaladinWalkingToIdle
-	
-PaladinCastSpell:
-	playfram          	0x00
-	wait              	1
-	playsnd           	988	# Terran\Duran\TDnPss08.wav
-	wait              	10
-	playsnd           	988	# Terran\Duran\TDnPss08.wav
-	wait              	10
-	playsnd           	988	# Terran\Duran\TDnPss08.wav
-	wait              	10
-	nobrkcodestart
-	sigorder			32
-	castspell
-	playsndbtwn			1144 1147 # Paladin weaponfire 01, 02, 03, 04
-	wait				7
-	playsndbtwn			1144 1147 # Paladin weaponfire
-	wait				7
-	playsndbtwn			1144 1147 # Paladin weaponfire
-	wait				7
-	playsndbtwn			1144 1147 # Paladin weaponfire
-	wait				7
-	playsndbtwn			1144 1147 # Paladin weaponfire
-	wait				7
-	playsndbtwn			1144 1147 # Paladin weaponfire
-	wait				7
-	playsndbtwn			1144 1147 # Paladin weaponfire
-	wait				7
-	sigorder			2
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-	wait              	1 
-	goto              	PaladinWalkingToIdle
 
 PaladinWalking:
 	move              	3
@@ -28140,7 +28107,7 @@ SalamanderDeath:
 SalamanderGndAttkInit:
 	wait              	1
 	nobrkcodestart
-	playsndbtwn	       	683 685 # Salamander weaponfire 01, 02, 03
+	playsndbtwn	       	2777 2779 # Salamander weaponfire 01, 02, 03
 	attackwith			1
 	wait				3
 	attackwith			1
@@ -44924,7 +44891,7 @@ WyvernGndAttkToIdle:
 	goto              	ScourgeLocal00
 
 WyvernDeath:
-	playsnd           	1120 # Zerg\ZergDuran\ZDnPss08.wav
+	playsnd           	2838 # Wyvern death 01
 	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul			844 0 42 # Terran Unit Rubble Medium
@@ -45125,7 +45092,7 @@ ShamanSupportModeGndAttkToIdle:
 	goto              	ShamanSupportModeGndAttkToIdle
 
 ShamanSupportModeDeath:
-	playsndbtwn       	986 987 # Shaman Death 01, 02 (replace these!)
+	playsndbtwn       	2834 2835 # Shaman Death 01, 02
 	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul			821 0 0 # Shaman Remains
@@ -47397,7 +47364,7 @@ CataphractLocal00:
 	goto				CataphractLocal00
 
 CataphractDeath:
-	playsnd           	985	# Terran\Duran\TDnPss05.wav
+	playsnd           	2820 # Goliath death 01
 	imgol             	333 0 0	# Explosion2 (Medium) (thingy\tBangL.grp)
 	wait              	3
 	lowsprul			273 0 0 # Terran Building Rubble Small
@@ -50844,7 +50811,7 @@ ShamanVisionaryModeGndAttkToIdle:
 	goto				ShamanVisionaryModeGndAttkToIdle
 
 ShamanVisionaryModeDeath:
-	playsndbtwn       	1385 1386 # Matador death 01, 02
+	playsndbtwn       	2834 2835 # Shaman Death 01, 02
 	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
 	wait              	3
 	lowsprul			845 0 0 # Terran Unit Rubble Small