Fix new bullet crash; Initial work for Upstart Terran faction

mpq/arr/sfxdata.txt

@@ -2440,32 +2440,32 @@ Striga Under Attack 01
 Striga Under Attack 02
 Striga Under Attack 03
 Striga Under Attack 04
-Extended Sound #1
+Southpaw Weaponfire 01
-Extended Sound #1
+Southpaw Weaponfire 02
-Extended Sound #1
+Southpaw Ready 01
-Extended Sound #1
+Southpaw What 01
-Extended Sound #1
+Southpaw What 02
-Extended Sound #1
+Southpaw What 03
-Extended Sound #1
+Southpaw What 04
-Extended Sound #1
+Southpaw Order Passive 01
-Extended Sound #1
+Southpaw Order Passive 02
-Extended Sound #1
+Southpaw Order Passive 03
-Extended Sound #1
+Southpaw Order Passive 04
-Extended Sound #1
+Wendigo Weaponfire 01
-Extended Sound #1
+Wendigo Weaponfire 02
-Extended Sound #1
+Wendigo Death 01
-Extended Sound #1
+Wendigo Death 02
-Extended Sound #1
+Wendigo Death 03
-Extended Sound #1
+Wendigo Death 04
-Extended Sound #1
+Wendigo Ready 01
-Extended Sound #1
+Wendigo What 01
-Extended Sound #1
+Wendigo What 02
-Extended Sound #1
+Wendigo What 03
-Extended Sound #1
+Wendigo What 04
-Extended Sound #1
+Wendigo Order Passive 01
-Extended Sound #1
+Wendigo Order Passive 02
-Extended Sound #1
+Wendigo Order Passive 03
-Extended Sound #1
+Wendigo Order Passive 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -1245,8 +1245,8 @@ cm\p\pariah\dth-02.wav
 cm\p\pariah\dth-03.wav
 cm\p\pariah\dth-04.wav
 cm\p\starsovereign\ch-01.wav
-cm\t\southpaw\dth-01.wav
+cm\f\southpaw\dth-01.wav
-cm\t\southpaw\dth-02.wav
+cm\f\southpaw\dth-02.wav
 cm\t\gorgon\dth-01.wav
 cm\t\gorgon\dth-02.wav
 cm\t\gorgon\dth-03.wav
@@ -1615,23 +1615,23 @@ cm\t\striga\yes-03.wav
 cm\t\striga\yes-04.wav
 cm\t\striga\wf-01.wav
 cm\t\striga\wf-02.wav
-cm\f\axitrilisk\rdy-01.wav
+cm\z\axitrilisk\rdy-01.wav
-cm\f\axitrilisk\wht-01.wav
+cm\z\axitrilisk\wht-01.wav
-cm\f\axitrilisk\wht-02.wav
+cm\z\axitrilisk\wht-02.wav
-cm\f\axitrilisk\wht-03.wav
+cm\z\axitrilisk\wht-03.wav
-cm\f\axitrilisk\wht-04.wav
+cm\z\axitrilisk\wht-04.wav
-cm\f\axitrilisk\yes-01.wav
+cm\z\axitrilisk\yes-01.wav
-cm\f\axitrilisk\yes-02.wav
+cm\z\axitrilisk\yes-02.wav
-cm\f\axitrilisk\yes-03.wav
+cm\z\axitrilisk\yes-03.wav
-cm\f\axitrilisk\yes-04.wav
+cm\z\axitrilisk\yes-04.wav
-cm\f\axitrilisk\wf-01.wav
+cm\z\axitrilisk\wf-01.wav
-cm\f\axitrilisk\wf-02.wav
+cm\z\axitrilisk\wf-02.wav
-cm\f\axitrilisk\wf-03.wav
+cm\z\axitrilisk\wf-03.wav
-cm\f\axitrilisk\wf-04.wav
+cm\z\axitrilisk\wf-04.wav
-cm\f\axitrilisk\wf-05.wav
+cm\z\axitrilisk\wf-05.wav
-cm\f\axitrilisk\sl-01.wav
+cm\z\axitrilisk\sl-01.wav
-cm\f\axitrilisk\sl-02.wav
+cm\z\axitrilisk\sl-02.wav
-cm\f\axitrilisk\sl-03.wav
+cm\z\axitrilisk\sl-03.wav
 cm\t\anticthon\wf-01.wav
 cm\t\anticthon\wf-02.wav
 cm\t\anticthon\wf-03.wav
@@ -2439,4 +2439,30 @@ cm\t\striga\agg-04.wav
 cm\t\striga\hlp-01.wav
 cm\t\striga\hlp-02.wav
 cm\t\striga\hlp-03.wav
-cm\t\striga\hlp-04.wav
+cm\t\striga\hlp-04.wav
+cm\f\southpaw\wf-01.wav
+cm\f\southpaw\wf-02.wav
+cm\f\southpaw\rdy-01.wav
+cm\f\southpaw\wht-01.wav
+cm\f\southpaw\wht-02.wav
+cm\f\southpaw\wht-03.wav
+cm\f\southpaw\wht-04.wav
+cm\f\southpaw\yes-01.wav
+cm\f\southpaw\yes-02.wav
+cm\f\southpaw\yes-03.wav
+cm\f\southpaw\yes-04.wav
+cm\f\wendigo\wf-01.wav
+cm\f\wendigo\wf-02.wav
+cm\f\wendigo\dth-01.wav
+cm\f\wendigo\dth-02.wav
+cm\f\wendigo\dth-03.wav
+cm\f\wendigo\dth-04.wav
+cm\f\wendigo\rdy-01.wav
+cm\f\wendigo\wht-01.wav
+cm\f\wendigo\wht-02.wav
+cm\f\wendigo\wht-03.wav
+cm\f\wendigo\wht-04.wav
+cm\f\wendigo\yes-01.wav
+cm\f\wendigo\yes-02.wav
+cm\f\wendigo\yes-03.wav
+cm\f\wendigo\yes-04.wav

mpq/scripts/iscript.txt

@@ -28835,7 +28835,7 @@ SalamanderDeath:
 	end
 
 SalamanderGndAttkInit:
-	wait              	2
+	wait              	1
 	nobrkcodestart
 	playsndbtwn	       	683 685 # Salamander weaponfire 01, 02, 03
 	attackwith			1
@@ -28843,8 +28843,7 @@ SalamanderGndAttkInit:
 	attackwith			1
 	wait				3
 	attackwith			1
-	wait				3
+	wait				1
-	wait 				1
 	nobrkcodeend
 	gotorepeatattk
 	ignorerest
@@ -31211,7 +31210,7 @@ TalosGndAttkRpt:
 	playfram          	0x20
 	wait				1
 	playfram          	0x40
-	playsndbtwn			2012 2013 # Talos attack 01, 02
+	playsndbtwn			2012 2013 # Talos weaponfire 01, 02
 	attackwith        	1
 	wait              	1
 	playfram			0x20
@@ -48301,7 +48300,7 @@ WendigoGndAttkInit:
 	wait              	1
 	nobrkcodestart
 	playfram			0x40
-	playsndbtwn			2012 2013 # Talos attack 01, 02
+	playsndbtwn			2453 2454 # Wendigo weaponfire 01, 02
 	attackwith        	1
 	wait				1
 	playfram			0x60
@@ -48371,8 +48370,17 @@ SouthpawDeath:
 
 SouthpawGndAttkInit:
 	wait              	1
-	attackwith        	1
+	nobrkcodestart
-	playsnd           	74 # Bullet\TPhFi100.wav
+	playsndbtwn			2442 2443 # Southpaw weaponfire 01, 02
+	attackwith			1
+	wait				2
+	playsndbtwn			2442 2443 # Southpaw weaponfire
+	attackwith			1
+	wait				2
+	playsndbtwn			2442 2443 # Southpaw weaponfire
+	attackwith			1
+	wait				1
+	nobrkcodeend
 	gotorepeatattk
 	goto              	SouthpawLocal00