Update SFX for various weaponfires

mpq/arr/sfxdata.txt

@@ -2134,9 +2134,9 @@ Vagrant Shade Weaponfire 02
 Vagrant Shade Weaponfire 03
 Vagrant Shade Weaponfire 04
 Vagrant Shade Weaponfire 05
-Optecton Weaponfire 01
+Optecton Weaponfire 2 01
-Optecton Weaponfire 02
+Optecton Weaponfire 2 02
-Optecton Weaponfire 03
+Optecton Weaponfire 2 03
 Hippogriff Weaponfire 01
 Hippogriff Weaponfire 02
 Hippogriff Weaponfire 03
@@ -2308,10 +2308,10 @@ Madrigal Dirge Proc 01
 Madrigal Dirge Proc 02
 Madrigal Dirge Proc 03
 Didact Stasis Field Channel 01
-Extended Sound #1
+Optecton Weaponfire 1 01
-Extended Sound #1
+Optecton Weaponfire 1 02
-Extended Sound #1
+Optecton Weaponfire 1 03
-Extended Sound #1
+Optecton Weaponfire 1 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/scripts/iscript.txt

@@ -30795,7 +30795,7 @@ AirAttkInit   	AtreusGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	AtreusGndAttkInit
 AirAttkRpt    	AtreusGndAttkInit
-CastSpell     	AtreusCastSpell
+CastSpell     	[NONE]
 GndAttkToIdle 	AtreusGndAttkToIdle
 AirAttkToIdle 	AtreusGndAttkToIdle
 Unused2       	[NONE]
@@ -30897,26 +30897,7 @@ AtreusGndAttkRpt:
 	nobrkcodeend
 	gotorepeatattk
 	ignorerest
-	goto				AtreusGndAttkToIdle	
+	goto				AtreusGndAttkToIdle
-
-AtreusCastSpell:
-	playfram			0x00
-	wait				1
-	nobrkcodestart
-	playfram			0x1A9
-	playsnd           	101 # Bullet\LaserB.wav
-	castspell
-	sigorder			2
-	wait				1
-	playfram			0x1BA
-	wait				1
-	playfram			0x1CB
-	wait				1
-	playfram			0x00
-	wait				1
-	nobrkcodeend
-	gotorepeatattk
-	goto              	AtreusGndAttkToIdle
 
 AtreusWalking:
 	move				4
@@ -30976,6 +30957,7 @@ AtreusWalkingToIdle:
 AtreusWarpIn:
 	imgol             	125 0 0	# High Templar Warp Flash (protoss\templar.grp)
 	goto              	AtreusLocal00
+
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
 # 1174 Amaranth (cm\protoss\amaranth.grp)
@@ -52167,4 +52149,180 @@ SpirtithColonyBuilt:
 	wait              	2
 	playfram          	0x00
 	wait              	2
-	goto              	SpirtithColonyBuilt
+	goto              	SpirtithColonyBuilt
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1700 Optecton (cm\protoss\optecton.grp)
+.headerstart
+IsId          	728
+Type          	21
+Init          	OptectonInit
+Death         	OptectonDeath
+GndAttkInit   	OptectonGndAttkInit
+AirAttkInit   	OptectonGndAttkInit
+Unused1       	[NONE]
+GndAttkRpt    	OptectonGndAttkInit
+AirAttkRpt    	OptectonGndAttkInit
+CastSpell     	[NONE]
+GndAttkToIdle 	OptectonGndAttkToIdle
+AirAttkToIdle 	OptectonGndAttkToIdle
+Unused2       	[NONE]
+Walking       	OptectonWalking
+WalkingToIdle 	OptectonWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	OptectonWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+OptectonInit:
+	imgul             	1625 0 0 # Optecton Shadow (cm\protoss\optecton-shad.grp)
+	playfram          	0x00
+	wait				2
+OptectonLocal00:
+	wait				1
+	waitrand			62 74
+	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
+	
+OptectonGndAttkToIdle:
+	playfram          	0x00
+	wait				2
+	goto              	OptectonLocal00
+
+OptectonDeath:
+	playsnd           	533	# Protoss\Scout\PScDth00.WAV
+	imgol             	213 0 0	# Explosion1 (Small) (thingy\tBangS.grp)
+	wait 2
+	lowsprul          	192 0 0	# Dracadin Remnants (protoss\pdrDeath.grp)
+	wait              	1 
+	end
+
+OptectonGndAttkInit:
+	playfram          	0x00
+OptectonGndAttkRpt:
+	wait				1
+	nobrkcodestart
+	playfram			0x1A9
+	playsndbtwn			2310 2313 # Optecton weapon fire 01, 02, 03, 04
+	attackwith        	1
+	wait				1
+	playfram			0x1BA
+	wait				1
+	playfram			0x1CB
+	wait				1
+	playfram			0x00
+	wait				1
+	nobrkcodeend
+	gotorepeatattk
+	ignorerest
+	goto				OptectonGndAttkToIdle
+
+OptectonWalking:
+	move				4
+	wait				1
+	playfram          	0xcc
+	move				4
+	wait				1
+	playfram          	0xdd
+	move				4
+	wait				1
+	playfram          	0xee
+	move				4
+	wait				1
+	playfram          	0xff
+	move				4
+	wait				1
+	playfram          	0x110
+	move				4
+	wait				1
+	playfram          	0x121
+	move				4
+	wait				1
+	playfram          	0x132
+	move				4
+	wait				1
+	playfram          	0x143
+	move				4
+	wait				1
+	playfram          	0x154
+	move				4
+	wait				1
+	playfram          	0x165
+	move				4
+	wait				1
+	playfram          	0x176
+	move				4
+	wait				1
+	playfram          	0x187
+	move				4
+	wait				1
+	playfram          	0x198
+	move				4
+	wait				1
+	playfram          	0x99
+	move				4
+	wait				1
+	playfram          	0xaa
+	move				4
+	wait				1
+	playfram          	0xbb
+	goto				OptectonWalking
+
+OptectonWalkingToIdle:
+	playfram          	0x00
+	goto              	OptectonLocal00
+
+OptectonWarpIn:
+	imgol             	125 0 0	# High Templar Warp Flash (protoss\templar.grp)
+	goto              	OptectonLocal00

patchnotes.md

@@ -22,6 +22,9 @@ Aside from that: We are continuing to polish existing content and remove low-cou
 
 ## Audiovisuals
 - Superior engine graphics for the Mason and the Trojan have been added (c. DarkenedFantasies)
+- Weapon fire SFX for Madcap, Sundog, and Salamander have been adjusted to reduce clipping
+- New weaponfire SFX:
+	- Optecton (both attacks)
 
 ## UI
 - Config: It is now possible to specify your default map directory, using file paths with single backslashes (e.g. "BroodWar\CMBW-Prerelease\CMBW-maps") (c. Veeq7)
@@ -49,5 +52,7 @@ Aside from that: We are continuing to polish existing content and remove low-cou
 ## Protoss
 - [Mind Tyrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/mind-tyrant):
 	- Maelstrom projectile now significantly slower
+- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
+	- Skybond Ray damage now 10, from 5
 - [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact):
 	- Stasis Field is now a channel