Fix a few minor bugs; Fix occasional Optecton lockup

mpq/scripts/iscript.txt

@@ -14172,73 +14172,7 @@ VorvrokorInit:
 	imgul             	1772 -1 -5 # Vorvrokor Shadow (cm\zerg\vorvrokor-shadow.grp)
 VorvrokorGndAttkToIdle:
 	playfram          	0x55
-	goto              	VorvrokorLocal00
+	goto              	ZethrokorLocal00
-
-VorvrokorLocal00:
-	wait 				62
-	randcondjmp       	25 VorvrokorLocal01
-	randcondjmp       	128 VorvrokorLocal02
-	goto              	VorvrokorLocal00
-
-VorvrokorLocal01:
-	playfram          	0x00
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	playfram          	0x33
-	wait              	12
-	playfram          	0x22
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x00
-	wait              	1
-	goto              	VorvrokorGndAttkToIdle
-
-VorvrokorLocal02:
-	randcondjmp       	128 VorvrokorLocal03
-	playfram          	0x66
-	wait              	1
-	turnccwise        	1
-	playfram          	0x77
-	wait              	1
-	turnccwise        	1
-	playfram          	0x88
-	wait              	1
-	turnccwise        	1
-	playfram          	0x99
-	wait              	1
-	turnccwise        	1
-	playfram          	0xaa
-	wait              	1
-	turnccwise        	1
-	playfram          	0xbb
-	wait              	1
-	turnccwise        	1
-	goto              	VorvrokorGndAttkToIdle
-
-VorvrokorLocal03:
-	playfram          	0x66
-	wait              	1
-	turncwise         	1
-	playfram          	0x77
-	wait              	1
-	turncwise         	1
-	playfram          	0x88
-	wait              	1
-	turncwise         	1
-	playfram          	0x99
-	wait              	1
-	turncwise         	1
-	playfram          	0xaa
-	wait              	1
-	turncwise         	1
-	playfram          	0xbb
-	wait              	1
-	turncwise         	1
-	goto              	VorvrokorGndAttkToIdle
 
 VorvrokorDeath:
 	playsnd           	1160 # Vorvrokor death 01
@@ -47828,16 +47762,76 @@ OptectonGndAttkRpt:
 	wait				7
 	imgol				1820 0 0 # Architect charge overlay
 	wait				8
-	call 				OptectonShoot
+	playfram			0x220
-	call 				OptectonShoot
+	imgoluselo			1855 0 0 # Optecton muzzle flash
-	call 				OptectonShoot
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
-	call 				OptectonShoot
+	attackwith        	1
-	call 				OptectonShoot
+	wait				1
-	call 				OptectonShoot
+	playfram			0x240
-	call 				OptectonShoot
+	wait				3
-	call 				OptectonShoot
+	playfram			0x220
-	call 				OptectonShoot
+	imgoluselo			1855 0 0 # Optecton muzzle flash
-	call 				OptectonShoot
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
+	playfram			0x220
+	imgoluselo			1855 0 0 # Optecton muzzle flash
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x240
+	wait				3
 	playfram			0x260
 	wait				1
 	playfram			0x00
@@ -47847,16 +47841,6 @@ OptectonGndAttkRpt:
 	ignorerest
 	goto				OptectonGndAttkToIdle
 
-OptectonShoot:
-	playfram			0x220
-	imgoluselo			1855 0 0 # Optecton muzzle flash
-	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
-	attackwith        	1
-	wait				1
-	playfram			0x240
-	wait				3
-	return
-
 OptectonWalking:
 	move				4
 	wait				1

patchnotes.md

@@ -1,4 +1,4 @@
-# XX June 2024
+# XX July 2024
 ## Post-May Royal Invitational
 
 This patch will include bugfixes, audiovisual improvements, and balance changes.
@@ -49,6 +49,9 @@ Forthcoming.
 	- Phase Link no longer overcounts armor, miscounts damage, or spreads minimal damage incorrectly (c. Veeq7)
 	- Corrected lifesteal ratio for non-Mortothrokor attacks (r. GreenEggs'NSpam, c. Veeq7)
 	- Fixed splash bleeding through Ancile Providence (bountied by TheShambler; c. Veeq7)
+	- Fixed Ancile nullifying all damage with its last energy (r. Krankendau, c. Veeq7)
+	- Units with secondary weapons (Durendal, Okrimnilisk) no longer fire on transports or Nydus Cesiants (r. lolrsk8s)
+	- Sycophants no longer proc Idolatry while in transports (r. The Shambler)
 	- Fixed issues with building modifiers (e.g. Debug game mode and Crucible) (c. Veeq7)
 	- Kalkalisks now properly regress to Nathrokors, if applicable (r. jakulangski)
 	- Combat cloak is now correctly cancelled by Magnetar Law of Attraction
@@ -92,7 +95,7 @@ Forthcoming.
 		- Weapon cooldown 0.83 » 0.75 
 - [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles):
 	- Build time 25 » 22
-	- **NEW: Kevlin Munitions:**
+	- **NEW: Kelvin Munitions:**
 		- Attacks reduce movement speed by 33% for 3 seconds
 - [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle):
 	- Resource costs 75/150 » 75/200