Implement Nydus Trinity Camazotz

mpq/arr/flingy.txt

@@ -702,7 +702,7 @@ Scralia
 Endbore Electricity
 Rozirokor
 Zytryleth
-Extended Flingy #496
+Camazotz
 Extended Flingy #497
 Extended Flingy #498
 Extended Flingy #499

mpq/arr/images.txt

@@ -2411,8 +2411,8 @@ Grimoire Shadow
 Zytryleth
 Zytryleth Shadow
 Inzorthrokor Mutate
-Extended Image #1411
+Camazotz
-Extended Image #1412
+Camazotz Shadow
 Extended Image #1413
 Extended Image #1414
 Extended Image #1415

mpq/arr/sfxdata.txt

@@ -4259,14 +4259,14 @@ Domain Passive 03
 Striga Death 01
 Striga Death 02
 Striga Death 03
-Extended Sound #1
+Camazotz Weaponfire 01
-Extended Sound #1
+Camazotz Weaponfire 02
-Extended Sound #1
+Camazotz Weaponfire 03
-Extended Sound #1
+Rozirokor Weaponfire 01
-Extended Sound #1
+Rozirokor Weaponfire 02
-Extended Sound #1
+Rozirokor Weaponhit 01
-Extended Sound #1
+Rozirokor Weaponhit 02
-Extended Sound #1
+Rozirokor Weaponhit 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -4259,3 +4259,11 @@ cm\a\domain\pas-03.wav
 cm\t\striga\dth-01.wav
 cm\t\striga\dth-02.wav
 cm\t\striga\dth-03.wav
+cm\f-t\camazotz\wf-01.wav
+cm\f-t\camazotz\wf-02.wav
+cm\f-t\camazotz\wf-03.wav
+cm\f-z\rozirokor\wf-01.wav
+cm\f-z\rozirokor\wf-02.wav
+cm\f-z\rozirokor\wh-01.wav
+cm\f-z\rozirokor\wh-02.wav
+cm\f-z\rozirokor\wh-03.wav

mpq/arr/sprites.txt

@@ -1161,7 +1161,7 @@ Pilgrim Remnants
 Rozirokor
 Rozirokor Remains
 Zytryleth
-Extended Sprite #647
+Camazotz
 Extended Sprite #648
 Extended Sprite #649
 Extended Sprite #650

mpq/arr/units.txt

@@ -618,7 +618,7 @@ Zerg Rozirokor (Imicren)
 Bloodsummon Thrombocyte
 Bloodsummon Grimoire
 Zerg Zytryleth (Zorthos)
-Extended Unit #393
+Terran Camazotz (Nydus Trinity)
 Extended Unit #394
 Extended Unit #395
 Extended Unit #396

mpq/rez/stat.txt

@@ -1336,8 +1336,8 @@ Must target units with energy.<0>
 <0>
 <0>
 <0>
-<0>
+¤<3><4>Tragyle's Coagulants <2>(passive)<10>Victims of the Camazotz's attacks react favorably to the serum within, and bleed a miasma that restores 3 HP to allies of the Harakan within 2 range.<0>
-<0>
+f<1><4>Train Camazotz <1>(<3>F<1>)<10>Sustaining infantry.<0>
 ¤<3><4>Seething Dominion <2>(passive)<10>Zytryleths cannot move once hatched, and launch their Omnispores at all targets within their weapon range.<0>
 Rozirokor requires:<10>   Hydrith Den<0>
 z<1><4>Morph to Izirokor <1>(<3>Z<1>)<10>Close-combat strain.<0>

mpq/scripts/iscript_terran.txt

@@ -20822,3 +20822,183 @@ CivilianDeathInit:
 	lowsprul          	1158 0 0 # Civilian Remnants (terran\civilian-remains.grp)
 	wait              	1
 	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 226 Camazotz (cm\f-t\camazotz.grp)
+.headerstart
+IsId          	847
+Type          	12
+Init          	CamazotzInit
+Death         	CamazotzDeath
+GndAttkInit   	CamazotzGndAttkInit
+AirAttkInit   	[NONE]
+Unused1       	CamazotzUnused1
+GndAttkRpt    	CamazotzGndAttkRpt
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	CamazotzGndAttkToIdle
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	CamazotzWalking
+WalkingToIdle 	CamazotzWalkingToIdle
+SpecialState1 	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+CamazotzInit:
+	imgulnextid			0 0 # Camazotz Shadow (cm\f-t\camazotz-shadow.grp)
+CamazotzWalkingToIdle:
+	playfram          	0x40
+CamazotzLocal00:
+	wait				63
+	randcondjmp       	25 CamazotzLocal01
+	randcondjmp       	128 CamazotzLocal02
+	goto              	CamazotzLocal00
+
+CamazotzLocal01:
+	playfram          	0x00
+	wait              	1
+	randcondjmp       	192 CamazotzLocal03
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	wait              	6
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	wait              	6
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	goto              	CamazotzWalkingToIdle
+
+CamazotzLocal03:
+	wait              	13 
+	goto              	CamazotzWalkingToIdle
+
+CamazotzLocal02:
+	playfram          	0x60
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	turnrand          	3
+	wait              	1
+	playfram          	0x60
+	wait              	1
+	goto              	CamazotzWalkingToIdle
+
+CamazotzDeath:
+	playsndbtwn       	296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV
+	imgol             	3 0 0 # Skryrokor Death (zerg\zavDeath.grp)
+	imgol             	332 0 0 # Explosion2 (Small) (thingy\tBangS.grp)
+	setfldirect       	0
+#	playfram          	170
+	wait              	2
+#	playfram          	171
+	wait              	2
+#	playfram          	172
+	wait              	2
+#	playfram          	173
+	wait              	2
+#	playfram          	174
+#	wait              	2
+#	playfram          	175
+#	wait              	2
+#	playfram          	176
+#	wait              	2
+#	playfram          	177
+#	wait              	2
+	lowsprul          	615 0 0 # Camazotz Remnants (cm\terran\camazotz-remnants.grp)
+	wait              	1
+	end
+	
+CamazotzUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect       	0
+	playsndbtwn			1163 1165 # Camazotz revive 01, 02, 03
+	sprol				742 0 0 # Explosion Small Reversed
+#	playfram			176
+	wait				2
+#	playfram			175
+	wait				2
+#	playfram			174
+	wait				2
+#	playfram			173
+	wait				2
+#	playfram			172
+	wait				2
+#	playfram			171
+	wait				2
+#	playfram			170
+	wait              	2
+	setfldirect       	12
+	nobrkcodeend
+	goto				CamazotzWalkingToIdle
+
+CamazotzGndAttkInit:
+	playfram          	0x00
+CamazotzGndAttkRpt:
+	wait              	1
+	nobrkcodestart
+	playsndbtwn			4261 4263 # Camazotz weaponfire 01, 02, 03
+	imgoluselo			2056 0 0 # Green projection attack
+	playfram          	0x20
+	sigorder			32
+	wait              	1
+	attkshiftproj     	52
+	sigorder			32
+	wait              	1
+	attkshiftproj     	80
+	sigorder			32
+	wait              	5
+	playfram          	0x00
+	wait              	2
+	ignorerest
+CamazotzGndAttkToIdle:
+	goto              	CamazotzWalkingToIdle
+
+CamazotzWalking:
+	move              	4
+	wait              	1
+	playfram          	0x60
+	move              	4
+	wait              	1
+	playfram          	0x80
+	move              	4
+	wait              	1
+	playfram          	0xA0
+	move              	4
+	wait              	1
+	playfram          	0xC0
+	move              	4
+	wait              	1
+	playfram          	0xE0
+	move              	4
+	wait              	1
+	playfram          	0x100
+	move              	4
+	wait              	1
+	playfram          	0x120
+	move              	4
+	wait              	1
+	playfram          	0x40
+	goto              	CamazotzWalking

mpq/scripts/iscript_zerg.txt

@@ -18456,12 +18456,12 @@ RozirokorGndAttkInit:
 RozirokorGndAttkRpt:
 	wait              	1
 	nobrkcodestart
-	playsndbtwn			3141 3144 # Tethzorokor weaponfire 01, 02, 03, 04
+	playsndbtwn			4264 4265 # Rozirokor weaponfire 01, 02
 	wait              	1
 	playfram          	0xBB
 	wait              	1
 	playfram          	0xCC
-	attackmelee       	2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV
+	attackmelee       	2 4266 4268 # Rozirokor weaponhit 01, 02, 03
 	wait              	2
 	playfram          	0xDD
 	wait              	2

patchnotes.md

@@ -64,6 +64,8 @@
 	- Resource costs 150/225 » 200/150
 - [Broadside](https://cosmonarchy.com/terran/broadside):
 	- HP 300 » 335
+- **NEW:** [Camazotz](https://cosmonarchy.com/terran/camazotz):
+	- **Nydus Trinity:** Harakan replacement. Sustaining infantry.
 
 ## Protoss
 - [Artisan](https://cosmonarchy.com/protoss/artisan):