Conclude first pass on Hierophant, Optecton graphics; Attempt fix at Terran AI addon priority conflict; Port to new trigger parser

mpq/arr/images.txt

@@ -1853,7 +1853,7 @@ Grand Library
 Grand Library Shadow
 Grand Library Warp Flash
 Gladius Charge
-Extended Image #853
+Optecton Muzzle Flash
 Extended Image #854
 Extended Image #855
 Extended Image #856

mpq/arr/portdata.txt

@@ -179,7 +179,7 @@ Cikralisk
 Kagralisk
 Hypnagogue
 Apostle
-Extended Portrait #72
+Pythean
 Extended Portrait #73
 Extended Portrait #74
 Extended Portrait #75

mpq/scripts/iscript.txt

@@ -47830,58 +47830,12 @@ OptectonInit:
 	imgul             	1625 0 0 # Optecton Shadow (cm\protoss\optecton-shad.grp)
 	playfram          	0x00
 	wait				2
-OptectonLocal00:
-	wait				62
-	randcondjmp       	25 OptectonLocal01
-	randcondjmp       	13 OptectonLocal02
-	goto              	OptectonLocal00
-
-OptectonLocal01:
-	playfram			0x11
-	wait				1
-	playfram			0x22
-	wait				1
-	playfram			0x33
-	wait				1
-	playfram			0x44
-	waitrand			8 15
-	playfram			0x33
-	wait				1
-	playfram			0x22
-	wait				1
-	randcondjmp			43 OptectonLocal01
-	playfram			0x11
-	wait				1
-	playfram			0x00
-	wait				1
-	randcondjmp			13 OptectonLocal02
-	goto				OptectonLocal00
-
-OptectonLocal02:
-	playfram			0x55
-	wait				1
-	playfram			0x66
-	wait				1
-	playfram			0x77
-	wait				1
-	playfram			0x88
-	waitrand			8 15
-	playfram			0x77
-	wait				1
-	playfram			0x66
-	wait				1
-	randcondjmp			43 OptectonLocal02
-	playfram			0x55
-	wait				1
-	playfram			0x00
-	wait				1
-	randcondjmp			13 OptectonLocal01
-	goto				OptectonLocal00
+	goto				ScourgeLocal00
 	
 OptectonGndAttkToIdle:
 	playfram          	0x00
 	wait				2
-	goto              	OptectonLocal00
+	goto              	ScourgeLocal00
 
 OptectonDeath:
 	playsnd           	533	# Protoss\Scout\PScDth00.WAV
@@ -47896,13 +47850,15 @@ OptectonGndAttkInit:
 OptectonGndAttkRpt:
 	wait				1
 	nobrkcodestart
-	playfram			0x1A9
+	wait				1
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
 	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
 	attackwith        	1
 	wait				1
-	playfram			0x1BA
+	playfram			0x240
 	wait				1
-	playfram			0x1CB
+	playfram			0x260
 	wait				1
 	playfram			0x00
 	wait				1
@@ -47914,61 +47870,61 @@ OptectonGndAttkRpt:
 OptectonWalking:
 	move				4
 	wait				1
-	playfram          	0xcc
+	playfram          	0x20
 	move				4
 	wait				1
-	playfram          	0xdd
+	playfram          	0x40
 	move				4
 	wait				1
-	playfram          	0xee
+	playfram          	0x60
 	move				4
 	wait				1
-	playfram          	0xff
+	playfram          	0x80
 	move				4
 	wait				1
-	playfram          	0x110
+	playfram          	0xA0
 	move				4
 	wait				1
-	playfram          	0x121
+	playfram          	0xC0
 	move				4
 	wait				1
-	playfram          	0x132
+	playfram          	0xE0
 	move				4
 	wait				1
-	playfram          	0x143
+	playfram          	0x100
 	move				4
 	wait				1
-	playfram          	0x154
+	playfram          	0x120
 	move				4
 	wait				1
-	playfram          	0x165
+	playfram          	0x140
 	move				4
 	wait				1
-	playfram          	0x176
+	playfram          	0x160
 	move				4
 	wait				1
-	playfram          	0x187
+	playfram          	0x180
 	move				4
 	wait				1
-	playfram          	0x198
+	playfram          	0x1A0
 	move				4
 	wait				1
-	playfram          	0x99
+	playfram          	0x1C0
 	move				4
 	wait				1
-	playfram          	0xaa
+	playfram          	0x1E0
 	move				4
 	wait				1
-	playfram          	0xbb
+	playfram          	0x200
 	goto				OptectonWalking
 
 OptectonWalkingToIdle:
 	playfram          	0x00
-	goto              	OptectonLocal00
+	goto              	ScourgeLocal00
 
 OptectonWarpIn:
 	imgol             	125 0 0	# Cantavis Warp Flash (protoss\templar.grp)
-	goto              	OptectonLocal00
+	goto              	ScourgeLocal00
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
@@ -51088,5 +51044,21 @@ GladiusChargeDeath:
 	playfram			3
 	wait				1
 	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1855 Optecton Muzzle Flash (cm\protoss\optecton-muzzle.grp)
+.headerstart
+IsId          	780
+Type          	1
+Init          	MuzzleFlashSingleInit
+Death         	Generic_Wait1End
+.headerend
+# ----------------------------------------------------------------------------- #
+
+MuzzleFlashSingleInit:
+	playfram          	0x00
+	wait              	1
+	end
 	
-## Next free IsId: 780
+## Next free IsId: 781

patchnotes.md

@@ -35,11 +35,15 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Restored 'Set Next Scenario' trigger action functionality
 
 ## Audiovisuals
+- Replaced sprites for:
+	- Hierophant (c. Baelethal)
+	- Optecton
 - Added reads for:
 	- Maverick Stimpack (inject, proc, expire)
 	- Savant form switch
 	- Madcap Cabeirus Feeders achieving full stacks
 	- Gladius Binding Plasma charge (visuals) and proc (audio)
+- Added portrait for Pythean (c. jun3hong)
 - Advisors:
 	- Replaced default Zerg advisor
 	- Achieved custom advisor support for:
@@ -71,6 +75,12 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 ## Protoss
 - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire):
 	- Sight range now 6, from 7
+- [Pariah](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pariah):
+	- Now blocks titanic movement (e.g. Penumbra, Optecton)
+- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
+	- Collision size now significantly larger
+	- No longer collides with small units
+	- Now moves ~14% faster
 - [Gateway](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gateway):
 	- Armor now 3, from 4
 - [Grand Library](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/grand-library):