Resolve many Kethrostalor bugs and add more SFX

mpq/arr/sfxdata.txt

@@ -3649,22 +3649,22 @@ Larva Spawn 02
 Larva Spawn 03
 Ancestral Archives What 01
 Kethraj Keep What 01
-Extended Sound #1
+Gorgrokor Death 01
-Extended Sound #1
+Gorgrokor Death 02
-Extended Sound #1
+Kethrostalor Weaponfire 01
-Extended Sound #1
+Kethrostalor Weaponfire 02
-Extended Sound #1
+Kethrostalor Weaponfire 03
-Extended Sound #1
+Kethrostalor Weaponhit 01
-Extended Sound #1
+Kethrostalor Weaponhit 02
-Extended Sound #1
+Kethrostalor Weaponhit 03
-Extended Sound #1
+Kethrostalor Weaponhit 04
-Extended Sound #1
+Kethrostalor Weaponhit 05
-Extended Sound #1
+Ultrokor Consume 01
-Extended Sound #1
+Ultrokor Consume 02
-Extended Sound #1
+Ultrokor Consume 03
-Extended Sound #1
+Askosi Scrap 01
-Extended Sound #1
+Askosi Scrap 02
-Extended Sound #1
+Askosi Scrap 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -3647,4 +3647,20 @@ cm\p\_building\monument-of-sin\amb-01.wav
 cm\z\larva\spawn-01.wav
 cm\z\larva\spawn-02.wav
 cm\z\larva\spawn-03.wav
-cm\p\_building\ancestral-archives\wht-01.wav
+cm\p\_building\ancestral-archives\wht-01.wav
+cm\z\gorgrokor\dth-01.wav
+cm\z\gorgrokor\dth-02.wav
+cm\z\kethrostalor\wf-01.wav
+cm\z\kethrostalor\wf-02.wav
+cm\z\kethrostalor\wf-03.wav
+cm\z\kethrostalor\wh-01.wav
+cm\z\kethrostalor\wh-02.wav
+cm\z\kethrostalor\wh-03.wav
+cm\z\kethrostalor\wh-04.wav
+cm\z\kethrostalor\wh-05.wav
+cm\z\ultrokor\eat-01.wav
+cm\z\ultrokor\eat-02.wav
+cm\z\ultrokor\eat-03.wav
+cm\a\scrap-01.wav
+cm\a\scrap-02.wav
+cm\a\scrap-03.wav

mpq/scripts/iscript_zerg.txt

@@ -6360,7 +6360,7 @@ GorgrokorWalkingToIdle:
 	goto              	GorgrokorWalkingToIdle
 
 GorgrokorDeath:
-	playsnd           	852	# Zerg\Guardian\ZGuDth00.WAV
+	playsndbtwn 		3651 3652 # Geszithalor death 01, 02
 	imgol             	28 0 0 # Geszithalor Death (zerg\zguDeath.grp)
 	wait              	1
 	lowsprul			963 0 42 # Zerg Building Rubble Small
@@ -16816,7 +16816,6 @@ KethrostalorGndAttkRpt:
 	nobrkcodestart
 	playfram			0x22
 	attackwith			1
-	playsndbtwn			1399 1400 # Kethrostalor weapon fire 01, 02
 	wait				1
 	playfram			0x33
 	wait				1
@@ -16826,7 +16825,6 @@ KethrostalorGndAttkRpt:
 	wait				4
 	playfram			0x66
 	attackwith			1
-	playsndbtwn			1399 1400 # Kethrostalor weapon fire 01, 02
 	wait				1
 	playfram			0x55
 	wait				1
@@ -16838,7 +16836,6 @@ KethrostalorGndAttkRpt:
 	wait				4
 	playfram			0x33
 	attackwith			1
-	playsndbtwn			1399 1400 # Kethrostalor weapon fire 01, 02
 	wait				1
 	playfram			0x44
 	wait				1
@@ -16852,7 +16849,6 @@ KethrostalorGndAttkRpt:
 	wait				4
 	playfram			0x33
 	attackwith			1
-	playsndbtwn			1399 1400 # Kethrostalor weapon fire 01, 02
 	wait				1
 	playfram			0x22
 	wait				1
@@ -16862,7 +16858,6 @@ KethrostalorGndAttkRpt:
 	wait				4
 	playfram			0x55
 	attackwith			1
-	playsndbtwn			1399 1400 # Kethrostalor weapon fire 01, 02
 	wait				1
 	playfram			0x66
 	wait				1
@@ -17050,4 +17045,290 @@ KethrajKeepIsWorking:
 	waitrand			1 2
 	playfram			10
 	wait				1
-	goto              	KethrajKeepIsWorking
+	goto              	KethrajKeepIsWorking
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1800 Iziralisk (cm\faction-z\iziralisk.grp)
+.headerstart
+IsId          	636
+Type          	26
+Init          	IziraliskInit
+Death         	IziraliskDeath
+GndAttkInit   	IziraliskGndAttkInit
+AirAttkInit   	IziraliskGndAttkInit
+Unused1       	IziraliskUnused1
+GndAttkRpt    	IziraliskGndAttkRpt
+AirAttkRpt    	IziraliskGndAttkRpt
+CastSpell     	[NONE]
+GndAttkToIdle 	IziraliskGndAttkToIdle
+AirAttkToIdle 	IziraliskGndAttkToIdle
+Unused2       	[NONE]
+Walking       	IziraliskWalking
+WalkingToIdle 	IziraliskWalkingToIdle
+SpecialState1 	SkryrokorLocal00
+SpecialState2 	IziraliskSpecialState2
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	[NONE]
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	[NONE]
+Burrow        	IziraliskBurrow
+UnBurrow      	IziraliskUnburrow
+Enable        	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+IziraliskInit:
+	imgul             	1801 0 0 # Iziralisk Shadow (cm\faction-z\iziralisk-shadow.grp)
+	goto				IziraliskWalkingToIdle
+IziraliskGndAttkToIdle:
+	playfram          	0xAA
+	goto              	IziraliskLocal00
+
+IziraliskLocal00:
+	wait              	62
+	randcondjmp       	128 IziraliskLocal01
+	goto              	IziraliskLocal00
+
+IziraliskLocal01:
+	playfram          	0x99
+	wait              	1
+	playfram          	0xAA
+	wait              	1
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xCC
+	wait              	4
+	randcondjmp			34 IziraliskLocal02
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xAA
+	wait              	1
+	playfram          	0x99
+	wait              	1
+	goto              	IziraliskWalkingToIdle
+
+IziraliskLocal02:
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xAA
+	wait              	3
+	randcondjmp       	62 IziraliskLocal03
+	randcondjmp       	51 IziraliskLocal04
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xCC
+	wait              	1
+	playfram          	0xBB
+	wait              	1
+	goto              	IziraliskWalkingToIdle
+
+IziraliskLocal03:
+	playfram          	0x99
+	wait              	4
+	playfram          	0x11
+	wait              	1
+	turnccwise         	1
+	playfram          	0x22
+	wait              	1
+	turnccwise         	1
+	playfram          	0x33
+	wait              	1
+	turnccwise         	1
+	playfram          	0x22
+	wait              	1
+	turnccwise         	1
+	playfram          	0x11
+	wait              	1
+	turnccwise         	1
+	goto              	IziraliskWalkingToIdle
+
+IziraliskLocal04:
+	playfram          	0x99
+	wait              	4
+	playfram          	0x11
+	wait              	1
+	turncwise         	1
+	playfram          	0x22
+	wait              	1
+	turncwise         	1
+	playfram          	0x33
+	wait              	1
+	turncwise         	1
+	playfram          	0x22
+	wait              	1
+	turncwise         	1
+	playfram          	0x11
+	wait              	1
+	turncwise         	1
+	goto              	IziraliskWalkingToIdle
+
+IziraliskDeath:
+	playsnd           	1506 # Iziralisk death 01
+	setfldirect       	0
+	playfram          	459
+	wait              	2
+	playfram          	460
+	wait              	2
+	playfram          	461
+	wait              	2
+	playfram          	462
+	wait              	2
+	playfram          	463
+	wait              	2
+	playfram          	464
+	wait              	2
+	playfram          	465
+	wait              	2
+	playfram          	466
+	wait              	2
+	lowsprul          	763 0 0 # Iziralisk Remnants (cm\zerg\izirokor-corpse.grp)
+	wait              	2
+	end
+	
+IziraliskUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect       	0
+	playsnd				1181
+	playfram			639
+	wait				2
+	playfram			638
+	wait				2
+	playfram			637
+	wait				2
+	playfram			636
+	wait				2
+	playfram			635
+	wait				2
+	playfram			634
+	wait				2
+	playfram			633
+	wait				2
+	playfram			632
+	wait				2
+	playfram			631
+	wait				2
+	playfram			630
+	wait				2
+	setfldirect       	14
+	nobrkcodeend
+	goto				IziraliskWalkingToIdle
+
+IziraliskGndAttkInit:
+	playfram          	0x99
+	wait				1
+	playfram			0xAA
+IziraliskGndAttkRpt:
+	wait              	1
+	nobrkcodestart
+	playsndbtwn			1880 1881 # Iziralisk weapon fire 01, 02
+	wait              	1
+	playfram          	0xBB
+	wait              	1
+	playfram          	0xCC
+	attackwith			1
+	wait              	2
+	playfram          	0xDD
+	wait              	2
+	playfram          	0xEE
+	wait              	1
+	playfram          	0xFF
+	wait              	2
+	playfram          	0x110
+	wait              	1
+	playfram          	0x121
+	wait              	1
+	nobrkcodeend
+	playfram          	0x132
+	wait              	1
+	gotorepeatattk
+	goto              	IziraliskGndAttkToIdle
+
+IziraliskWalking:
+	move              	5
+	wait              	1
+	playfram          	0x11
+	move              	5
+	wait              	1
+	playfram          	0x22
+	move              	5
+	wait              	1
+	playfram          	0x33
+	move              	5
+	wait              	1
+	playfram          	0x44
+	move              	5
+	wait              	1
+	playfram          	0x55
+	move              	5
+	wait              	1
+	playfram          	0x66
+	move              	5
+	wait              	1
+	playfram          	0x77
+	move              	5
+	wait              	1
+	playfram          	0x88
+	goto              	IziraliskWalking
+	
+IziraliskWalkingToIdle:
+	playfram          	0x0
+	goto              	IziraliskLocal00
+	
+IziraliskSpecialState2:
+	playfram			0x187
+	goto				SkryrokorLocal00
+
+IziraliskBurrow:
+	imgol             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0x143
+	wait              	1
+	playfram          	0x154
+	wait              	1
+	playfram          	0x165
+	wait              	1
+	playfram          	0x176
+	wait              	1
+	playfram          	0x187
+	imgol             	423 15 12 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -15 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 -12 -3 # Burrowing Dust (thingy\bDust.grp)
+	wait              	1
+	playfram          	0x198
+	wait              	1
+	playfram          	0x1A9
+	wait              	1
+	sigorder          	4
+	playfram			0x1BA
+	goto				SkryrokorLocal00
+
+IziraliskUnburrow:
+	wait 				1
+	waitrand          	1 2
+	imgul             	423 0 0	# Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 12 -9 # Burrowing Dust (thingy\bDust.grp)
+	playfram          	0x1A9
+	wait              	1
+	playfram          	0x198
+	wait              	1
+	playfram          	0x187
+	wait              	1
+	playfram          	0x176
+	imgol             	423 12 -15 # Burrowing Dust (thingy\bDust.grp)
+	imgol             	423 -12 -12 # Burrowing Dust (thingy\bDust.grp)
+	wait              	1
+	playfram          	0x165
+	wait              	1
+	playfram          	0x154
+	wait              	1
+	sigorder          	4
+	setfldirect			14
+	goto              	IziraliskWalkingToIdle

patchnotes.md

@@ -28,6 +28,7 @@
 	- Ambient training SFX (Grand Library, Rogue Gallery, Prostration Stage, Ancestral Archives, Ardent Authority, Unitary Union, Synthetic Synod, Argosy, Monument of Sin)
 	- Attack windup (Optecton)
 	- Building response (Ancestral Archives)
+	- Death (Gorgrokor)
 - Modified SFX for:
 	- Ambient training SFX (Ministry, Embassy, Lattice)
 
@@ -63,6 +64,9 @@
 	- Vision range 9 » 7
 - [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor):
 	- Vision range 9 » 8
+- [Keskathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/keskathalor):
+	- Armor 4 » 3
+	- Vision range 9 » 8
 - [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk):
 	- Now requires **Kethraj Keep**
 - [Ulgorg Cavern](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ulgorg-cavern):