Add novel repeating read for Demiurge Worship victims; Add Positron projectile; Add Salamander weaponhit

mpq/arr/flingy.txt

@@ -515,7 +515,7 @@ Okrimnilisk
 Cherbrathalor
 Grand Library
 Magister Weapon Impact
-Extended Flingy #309
+Positron Projectile
 Extended Flingy #310
 Extended Flingy #311
 Extended Flingy #312

mpq/arr/images.txt

@@ -1490,9 +1490,9 @@ Infested Overlay Medium
 Infested Overlay Large
 Gas Raw
 Gas Raw Depleted
-Worship Small
+Demiurge Worship Overlay Small
-Worship Medium
+Demiurge Worship Overlay Medium
-Worship Large
+Demiurge Worship Overlay Large
 Controlled Demolition
 Emergency Detonation
 Madrigal Death Explosion
@@ -1873,13 +1873,13 @@ Olympian Dishonorable Discharge 3
 Magnetar Law of Attraction 1
 Magnetar Law of Attraction 2
 Magnetar Law of Attraction 3
-Extended Image #873
+Salamander Weaponhit
-Extended Image #874
+Positron Projectile
-Extended Image #875
+Demiurge Worship Proc Small
-Extended Image #876
+Demiurge Worship Proc Medium
-Extended Image #877
+Demiurge Worship Proc Large
-Extended Image #878
+Demiurge Worship Proc XLarge
-Extended Image #879
+Demiurge Worship Overlay XLarge
 Extended Image #880
 Extended Image #881
 Extended Image #882

mpq/arr/sfxdata.txt

@@ -3101,9 +3101,9 @@ Ataltreth Advisor Warp Complete 01
 Gladius Passive Fire 01
 Gladius Passive Fire 02
 Gladius Passive Fire 03
-Extended Sound #1
+Hierophant Banter B 01
-Extended Sound #1
+Hierophant Banter B 02
-Extended Sound #1
+Hierophant Banter B 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sprites.txt

@@ -913,7 +913,7 @@ Olympian Dishonorable Discharge 3
 Magnetar Law of Attraction 1
 Magnetar Law of Attraction 2
 Magnetar Law of Attraction 3
-Extended Sprite #1
+Positron Projectile
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/scripts/iscript.txt

@@ -11303,7 +11303,6 @@ ZealotWalkingToIdle:
 ZealotLocal00:
 	wait              	62
 	randcondjmp       	64 ZealotLocal01
-	randcondjmp       	85 ZealotLocal02
 	goto              	ZealotLocal00
 
 ZealotLocal01:
@@ -11338,39 +11337,6 @@ ZealotLocal04:
 	wait              	1
 	goto              	ZealotWalkingToIdle
 
-ZealotLocal02:
-	playfram          	0x00
-ZealotLocal07:
-	playfram          	0x11
-	wait              	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x44
-	wait              	1
-	playfram          	0x00
-	waitrand          	1 4
-	randcondjmp       	115 ZealotLocal07
-	randcondjmp       	46 ZealotLocal08
-ZealotLocal09:
-	playfram          	0x33
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	waitrand          	1 4 
-	randcondjmp       	115 ZealotLocal07
-	randcondjmp       	209 ZealotLocal09
-	waitrand          	14 44
-	playfram          	0x00
-	wait              	1
-	goto              	ZealotWalkingToIdle
-
-ZealotLocal08:
-	wait              	1
-	waitrand          	14 44
-	playfram          	0x00
-	wait              	1
-	goto              	ZealotWalkingToIdle
-
 ZealotDeath:
 	playsnd           	678	# Protoss\ZEALOT\PZeDth00.WAV
 	setfldirect       	0
@@ -27269,7 +27235,8 @@ SalamanderMissileGndAttkInit:
 	goto              	SalamanderMissileGndAttkInit
 
 SalamanderMissileDeath:
-	playsnd           	9	# Misc\ExploSm.wav
+	imgol				1875 0 0 # Salamander weaponhit
+	playsnd           	9 # Misc\ExploSm.wav
 	domissiledmg
 	wait              	1 
 	end
@@ -40433,14 +40400,15 @@ GasRaw2Death:
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 1492 Worship (Small)  (cm\protoss\worship-small.grp)
+# 1492 Demiurge Worship Proc (Small)  (cm\protoss\demiurge-worship-proc-small.grp)
-# 1493 Worship (Medium) (cm\protoss\worship-medium.grp)
+# 1493 Demiurge Worship Proc (Medium) (cm\protoss\demiurge-worship-proc-medium.grp)
-# 1494 Worship (Large)  (cm\protoss\worship-large.grp)
+# 1494 Demiurge Worship Proc (Large)  (cm\protoss\demiurge-worship-proc-large.grp)
+# 1881 Demiurge Worship Proc (XLarge) (cm\protoss\demiurge-worship-proc-xlarge.grp)
 .headerstart
 IsId          	645
 Type          	1
 Init          	WorshipOverlayInit
-Death         	WorshipOverlayDeath
+Death         	Generic_Wait1End
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -40530,7 +40498,6 @@ WorshipOverlayInit:
 	playfram			42
 	wait				1
 	playfram			43
-WorshipOverlayDeath:
 	wait              	1
 	end
 
@@ -51256,6 +51223,7 @@ OlympianDishonorableDischargeInit:
 # 1872 Magnetar Law of Attraction 1 (cm\terran\magnetar-law-of-attraction-1.grp)
 # 1873 Magnetar Law of Attraction 2 (cm\terran\magnetar-law-of-attraction-2.grp)
 # 1874 Magnetar Law of Attraction 3 (cm\terran\magnetar-law-of-attraction-3.grp)
+# 1875 Salamander Weaponhit (cm\terran\salamander-weaponhit.grp)
 .headerstart
 IsId          	785
 Type          	1
@@ -51305,4 +51273,140 @@ MagnetarLawOfAttractionInit:
 	wait				1
 	end
 
-## Next free IsId: 786
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1876 Positron Projectile (cm\protoss\positron-projectile.grp)
+.headerstart
+IsId          	786
+Type          	2
+Init          	PositronProjectileInit
+Death         	PositronProjectileDeath
+GndAttkInit   	PositronProjectileLoop
+AirAttkInit   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+PositronProjectileInit:
+	playfram          	25
+	wait              	1
+	sigorder          	1
+	wait              	1
+	playfram			26
+	wait              	1
+	playfram			27
+PositronProjectileLoop:
+	wait              	1
+	playfram			10
+	wait              	1
+	playfram			11
+	wait              	1
+	playfram			12
+	wait              	1
+	playfram			13
+	wait              	1
+	playfram			14
+	wait              	1
+	playfram			15
+	wait              	1
+	playfram			16
+	wait              	1
+	playfram			17
+	wait              	1
+	playfram			18
+	wait              	1
+	playfram			19
+	wait              	1
+	playfram			20
+	wait              	1
+	playfram			21
+	wait              	1
+	playfram			22
+	wait              	1
+	playfram			23
+	wait              	1
+	playfram			24
+	wait              	1
+	playfram			25
+	wait              	1
+	playfram			26
+	wait              	1
+	playfram			27
+	goto				PositronProjectileLoop
+	
+PositronProjectileDeath:
+	playsnd           	2848 # Panoptus weaponhit 01
+	domissiledmg
+	wait				1
+	playfram			28
+	wait				1
+	playfram			29
+	wait				1
+	playfram			30
+	wait				1
+	playfram			31
+	wait				1
+	playfram			32
+	wait				1
+	playfram			33
+	wait				1
+	playfram			34
+	wait				1
+	playfram			35
+	wait				1
+	playfram			36
+	wait				1
+	playfram			37
+	wait				1
+	playfram			38
+	wait				1
+	playfram			39
+	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1877 Demiurge Worship Overlay Small  (cm\protoss\demiurge-worship-overlay-small.grp)
+# 1878 Demiurge Worship Overlay Medium (cm\protoss\demiurge-worship-overlay-medium.grp)
+# 1879 Demiurge Worship Overlay Large  (cm\protoss\demiurge-worship-overlay-large.grp)
+# 1880 Demiurge Worship Overlay XLarge (cm\protoss\demiurge-worship-overlay-xlarge.grp)
+.headerstart
+IsId          	787
+Type          	1
+Init          	DemiurgeWorshipProcInit
+Death         	Generic_Wait1End
+.headerend
+# ----------------------------------------------------------------------------- #
+
+DemiurgeWorshipProcInit:
+	playfram          	0x00
+	wait              	1
+	playfram			1
+	wait              	1
+	playfram			2
+	wait              	1
+	playfram			3
+	wait              	1
+	playfram			4
+	wait              	1
+	playfram			5
+	wait              	1
+	playfram			6
+	wait              	1
+	playfram			7
+	wait              	1
+	playfram			8
+	wait              	1
+	playfram			9
+	wait              	1
+	playfram			10
+	wait              	1
+	playfram			11
+	wait              	1
+	playfram			12
+	wait              	1
+	playfram			13
+	wait              	1
+	playfram			14
+	wait              	1
+	end
+	
+## Next free IsId: 788

patchnotes.md

@@ -56,7 +56,6 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 - Replaced sprites for:
 	- Hierophant (c. Baelethal)
 	- Optecton
-- Added weaponhit for Magister
 - Added reads for:
 	- Maverick Stimpack (inject, proc, expire)
 	- Savant form switch
@@ -64,15 +63,21 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Olympian Dishonorable Discharge proc
 	- Magnetar Law of Attraction proc
 	- Gladius Binding Plasma charge (visuals) and proc (audio)
-	- Herald Triumphant Rise / Patriarch Astral Rule debuffs
 	- Vengeful Ascension buffs
-- Added banter for:
+	- Herald Triumphant Rise / Patriarch Astral Rule debuffs
-	- Eidolon - successful missile strike
+	- Demiurge Worship (looping overlay on victims)
-	- Hierophant - a nearby enemy dies with full Signify stacks
+- Added projectiles for:
+	- Positron
+- Added weapon impacts for:
+	- Salamander
+	- Magister
 - Added portraits (c. jun3hong) for:
 	- Striga
 	- Pythean
 	- Amaranth
+- Added banter for:
+	- Eidolon - successful missile strike
+	- Hierophant - a nearby enemy dies with full Signify stacks
 - Advisors:
 	- Replaced default Zerg advisor
 	- Achieved custom advisor support for: