Fix interception bugs; Add Athuzelon; Add Hecaton Cyprian SFX

mpq/arr/flingy.txt

@@ -730,7 +730,7 @@ Memphis Turret (Flak Mode)
 Fragmentary Shells (with damage)
 Floor Flame Trap
 Zethalisk
-Extended Flingy #524
+Athuzelon
 Extended Flingy #525
 Extended Flingy #526
 Extended Flingy #527

mpq/arr/images.txt

@@ -2510,10 +2510,10 @@ Zethalisk Shadow
 Zethalisk Remains
 Zethalisk Birth
 Zethalisk Mutate
-Extended Image #1510
-Extended Image #1511
-Extended Image #1512
-Extended Image #1513
+Athuzelon
+Athuzelon Glow
+Athuzelon Shadow
+Athuzelon Warp Flash
 Extended Image #1514
 Extended Image #1515
 Extended Image #1516

mpq/arr/sfxdata.txt

@@ -4454,11 +4454,11 @@ Tetcaerokor Weaponhit 02
 Garvrokor Weaponhit 01
 Garvrokor Weaponhit 02
 Garvrokor Weaponhit 03
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Cyprian Weaponfire 01
+Cyprian Weaponfire 02
+Cyprian Weaponfire 03
+Cyprian Weaponfire 04
+Cyprian Weaponfire 05
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -4453,4 +4453,9 @@ cm\z\tetcaerokor\wh-01.wav
 cm\z\tetcaerokor\wh-02.wav
 cm\f-z\garvrokor\wh-01.wav
 cm\f-z\garvrokor\wh-02.wav
-cm\f-z\garvrokor\wh-03.wav
+cm\f-z\garvrokor\wh-03.wav
+cm\f-t\cyprian-hecaton\wf-01.wav
+cm\f-t\cyprian-hecaton\wf-02.wav
+cm\f-t\cyprian-hecaton\wf-03.wav
+cm\f-t\cyprian-hecaton\wf-04.wav
+cm\f-t\cyprian-hecaton\wf-05.wav

mpq/arr/sprites.txt

@@ -1210,8 +1210,8 @@ Striga Attack Overlay
 Pariah Attack Overlay
 Zethalisk
 Zethalisk Remains
-Extended Sprite #696
-Extended Sprite #697
+Athuzelon
+Athuzelon Glow
 Extended Sprite #698
 Extended Sprite #699
 Extended Sprite #700

mpq/arr/units.txt

@@ -654,7 +654,7 @@ Forerunner Insignis
 Forerunner Incaendium
 Forerunner Ossum
 Forerunner Voluntatis
-Extended Unit #429
+Protoss Athuzelon
 Extended Unit #430
 Extended Unit #431
 Extended Unit #432

mpq/arr/weapons.txt

@@ -316,7 +316,7 @@ Hellfire Missile Pack (Missile Trap)
 Vigil Autocannon (Gun Trap)
 Flamethrower (Flame Trap)
 Zethal Spores (Zethalisk)
-Extended Weapon #189
+Sacred Saber (Athuzelon)
 Extended Weapon #190
 Extended Weapon #191
 Extended Weapon #192

mpq/rez/stat.txt

@@ -308,7 +308,7 @@
 <0>
 <0>
 <0>
-<0>
+¤<3><4>Plasma Conduit <2>(passive)<10>Effects that restore shields are twice as effective for this combatant.<0>
 a<1><4>Build Memphis <1>(<3>A<1>)<10>Flak microtank.<0>
 Memphis Requires:<10>   Scrapyard<0>
 e<3><4>Flak Mode <1>(<3>E<1>)<10>Switches forms, gaining splash radius and targeting only airborne hostiles, while disabling movement.<0>
@@ -1444,7 +1444,7 @@ z<3><4>Blissful Embrace <1>(<3>Z<1>)<10>Channels onto the target. If the target
 <27><0><4>Cancel Embrace <1>(<3>ESC<1>)<0>
 s<1><4>Morph into Skithrokor <1>(<3>S<1>)<10>Airborne duelist strain.<0>
 Skithrokor requires:<10>   Skibact Scab<0>
-<0>
+a<1><4>Warp in Athuzelon <1>(<3>A<1>)<10>Peerless vanguard.<0>
 <0>
 <0>
 <0>
@@ -2315,7 +2315,7 @@ Hellfire Missile Pack<0>
 Vigil Autocannon<0>
 Flamethrower<0>
 Zethal Spores<0>
-<0>
+Sacred Saber<0>
 <0>
 <0>
 <0>

mpq/scripts/iscript_protoss.txt

@@ -16066,4 +16066,185 @@ GladiusOrderWalking:
 
 GladiusOrderWarpIn:
 	imgol             	2473 0 0 # Gladius (Order) Warp Flash (cm\f-p\gladius-order.grp)
-	goto              	GladiusOrderWalkingToIdle
+	goto              	GladiusOrderWalkingToIdle
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1284 Athuzelon (cm\f-p\athuzelon.grp)
+.headerstart
+IsId          	738
+Type          	21
+Init          	AthuzelonInit
+Death         	AthuzelonDeath
+GndAttkInit   	AthuzelonGndAttkInit
+AirAttkInit   	AthuzelonGndAttkInit
+Unused1       	AthuzelonUnused1
+GndAttkRpt    	AthuzelonGndAttkInit
+AirAttkRpt    	AthuzelonGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	AthuzelonGndAttkToIdle
+AirAttkToIdle 	AthuzelonGndAttkToIdle
+Unused2       	[NONE]
+Walking       	AthuzelonWalking
+WalkingToIdle 	AthuzelonWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	AthuzelonWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+AthuzelonInit:
+	imgul             	2514 0 0 # Athuzelon Shadow (cm\f-p\athuzelon.grp)
+AthuzelonLocal42:
+	playfram          	0x00
+	wait				1
+	goto              	AthuzelonLocal00
+
+AthuzelonLocal00:
+	playfram			0x20
+	wait				2
+	playfram			0x40
+	wait				2
+	playfram			0x60
+	wait				2
+	playfram			0x80
+	wait				2
+	playfram			0xA0
+	wait				2
+	playfram			0xC0
+	wait				2
+	playfram			0xE0
+	wait				2
+	playfram			0x100
+	wait				2
+	playfram			0x120
+	wait				2
+	playfram			0x140
+	wait				2
+	playfram			0x160
+	wait				2
+	playfram			0x00
+	wait				2
+	goto				AthuzelonLocal00
+
+AthuzelonDeath:
+	playsnd           	635	# Protoss\TEMPLAR\PTeDth00.WAV
+	playsnd           	533 # Protoss\Panoptus\PScDth00.WAV
+	imgol             	153 0 0 # Zealot Death (protoss\zealot.grp)
+	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
+	wait              	1
+	lowsprul			846 0 0 # Protoss Unit Rubble Medium
+	wait              	1
+	end
+	
+AthuzelonUnused1:
+	wait				1
+	nobrkcodestart
+	setfldirect       	0 
+	playsnd				1186 # Cantavis revive 01
+	imgol             	1445 0 0 # Zealot death reversed
+#	playfram			244
+	wait				2
+#	playfram			243
+	wait				2
+#	playfram			242
+	wait				2
+#	playfram			241
+	wait				2
+#	playfram			240
+	wait				2
+	wait				2
+	setfldirect       	12
+	nobrkcodeend
+	goto				AthuzelonLocal42
+
+AthuzelonGndAttkInit:
+	playfram          	0x200
+	wait              	1
+	nobrkcodestart
+	playfram          	0x220
+	wait              	1
+	playfram          	0x240
+	wait				1
+	playfram          	0x260
+	wait				1
+	playfram          	0x280
+	wait				1
+	playfram          	0x2A0
+	playsndbtwn			1231 1234 # Amaranth weaponfire 01, 02, 03, 04
+	playsndbtwn			2158 2160 # Athuzelon attack 01, 02, 03
+	attackwith        	1
+	wait				1
+	playfram          	0x2C0
+	wait				1
+	playfram          	0x2E0
+	wait				1
+	playfram          	0x300
+	wait				1
+	playfram          	0x320
+	wait				1
+	playfram          	0x340
+	playsndbtwn			1231 1234 # Amaranth weaponfire 01, 02, 03, 04
+	playsndbtwn			2158 2160 # Athuzelon attack 01, 02, 03
+	attackwith        	1
+	wait				1
+	playfram          	0x360
+	wait				1
+	playfram          	0x380
+	wait				1
+	playfram          	0x3A0
+	wait				1
+	nobrkcodeend
+	playfram          	0x3C0
+	wait				1
+	playfram          	0x3E0
+	wait				1
+	playfram          	0x400
+	wait				1
+	playfram          	0x420
+	wait				1
+	playfram          	0x440
+	wait				1
+	gotorepeatattk
+	wait				1
+	playfram          	0x00
+	wait				1
+	goto				AthuzelonGndAttkToIdle
+	
+AthuzelonGndAttkToIdle:
+	playfram 			0x00
+	wait 				1
+	goto              	AthuzelonLocal00
+
+AthuzelonWalking:
+	playfram          	0x180
+	wait              	1
+	playfram          	0x1A0
+	wait              	1
+	playfram          	0x1C0
+	wait              	1
+	playfram          	0x1E0
+	setvertpos        	0
+AthuzelonGlowLoop:
+	wait              	3
+	spruluselo        	1213 0 0 # Athuzelon Glow (cm\f-p\athuzelon-glow.grp)
+	goto              	AthuzelonGlowLoop
+	
+AthuzelonWalkingToIdle:
+	playfram          	0x1C0
+	wait              	1
+	playfram          	0x1A0
+	wait              	1
+	playfram          	0x180
+	wait              	1
+	goto				AthuzelonLocal00
+
+AthuzelonWarpIn:
+	imgol             	2515 0 0 # Athuzelon Warp Flash (cm\f-p\athuzelon.grp)
+	goto              	AthuzelonWalkingToIdle

mpq/scripts/iscript_terran.txt

@@ -22574,7 +22574,7 @@ CyprianHecatonGndAttkRpt:
 	wait              	1
 	nobrkcodestart
 	playfram          	0x1E0
-	playsndbtwn       	1189 1193 # Cyprian (Hecaton) weaponfire 01, 02, 03, 04, 05
+	playsndbtwn       	4456 4460 # Cyprian (Hecaton) weaponfire 01, 02, 03, 04, 05
 	attackwith        	1
 	wait              	1
 	playfram          	0x1C0

patchnotes.md

@@ -13,9 +13,10 @@
 	- As a result, Askosi now have their own music in melee, including a brand-new in-game track by Enozlliks!
 	- This also makes it so much easier to add music for forthcoming races!
 
-## Options
-- An audio tab has arrived! (c. Jesse)
-- *Please consult these newly-available options for background play and other useful settings!*
+## User Interface
+- An options menu audio tab has arrived! (c. Jesse)
+	- *Please consult these newly-available options for background play and other useful settings!*
+- You can now right click on a unit to follow that unit in replay/witness mode (c. DF)
 
 ## Bugfixes
 - **Stability:**
@@ -32,6 +33,7 @@
 	- Fixed wrong weaponfire SFX for Star Sovereign (r. lolrsk8s)
 	- Fixed Autocort spawning the wrong corpse
 	- Fixed missing Insurant weapon name (r. jakulangski)
+	- Corrected Memphis Flak Mode string (r. beriso)
 	- Fixed missing randomization for Quazrokor weaponfire SFX
 	- Fixed 'terrain' flag being listed for Alacyne, Histrion weapons (r. jakulangski)
 	- Corrected many outdated tips (r. Londier)
@@ -43,9 +45,15 @@
 - New selection responses for:
 	- Wellbore, Engram, Chokral Chazsal (c. jun3hong)
 - New weapon SFX for:
-	- Durendal, Adherent, Engram, Gosvileth, Ghitorokor, Inzorthrokor, Zobriolisk, Tetcaerokor, Garvrokor (c. lolrsk8s)
+	- Durendal, Cyprian (Hecaton), Adherent, Engram, Gosvileth, Ghitorokor, Inzorthrokor, Zobriolisk, Tetcaerokor, Garvrokor (c. lolrsk8s)
 - New unit responses for Gosvileth
 
+## Protoss factions
+- **NEW:** [Athuzelon](https://cosmonarchy.com/protoss/athuzelon):
+	- Order of the Sacred Saber - Patriarch replacement. Peerless vanguard.
+	- Bountied by 3crow!
+
 ## Zerg factions
 - **NEW:** [Zethalisk](https://cosmonarchy.com/zerg/zethalisk):
-	- Orkoti Tendril - Zethrokor replacement. Sustaining strain.
+	- Orkoti Tendril - Zethrokor replacement. Sustaining strain.
+	- Bartered for by lolrsk8s!