Revise Cyclops, Psionic Storm, and Uprising

mpq/arr/sfxdata.txt

@@ -3196,9 +3196,9 @@ Durendal Under Attack 01
 Durendal Under Attack 02
 Durendal Under Attack 03
 Durendal Under Attack 04
-Extended Sound #1
-Extended Sound #1
-Extended Sound #1
+Psionic Storm Start 01
+Psionic Storm Loop 01
+Psionic Storm End 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -3196,15 +3196,9 @@ cm\t\durendal\hlp-01.wav
 cm\t\durendal\hlp-02.wav
 cm\t\durendal\hlp-03.wav
 cm\t\durendal\hlp-04.wav
-caw.wav
-caw.wav
-caw.wav
-caw.wav
-caw.wav
-caw.wav
-caw.wav
-caw.wav
-caw.wav
+protoss\templar\psionic-storm-start-01.wav
+protoss\templar\psionic-storm-loop-01.wav
+protoss\templar\psionic-storm-end-01.wav
 caw.wav
 caw.wav
 caw.wav

mpq/arr/weapons.txt

@@ -215,7 +215,7 @@ Relentless Tendrils (Okrimnilisk)
 Omnispores (Okrimnilisk)
 Venemous Bursts (Cherbrathalor)
 Angeltear Rockets (Salamander)
-Extended Weapon #88
+Brontes Payload (Cyclops)
 Extended Weapon #89
 Extended Weapon #90
 Extended Weapon #91

mpq/scripts/iscript.txt

@@ -11018,46 +11018,6 @@ CantavisCastSpell:
 	wait              	1
 	playfram          	0x33
 	wait              	1
-	playfram          	0x44
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x44
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x44
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x44
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x44
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	playfram          	0x33
-	wait              	1
 	castspell
 	sigorder          	2
 	playfram          	0x44
@@ -14747,8 +14707,8 @@ STA_STSWardenOverlayDeath:
 IsId          	236
 Type          	14
 Init          	PsionicStormInit
-Death         	PsionicStormDeath
-GndAttkInit   	PsionicStormDeath
+Death         	Generic_Wait1End
+GndAttkInit   	Generic_Wait1End
 AirAttkInit   	[NONE]
 Unused1       	[NONE]
 GndAttkRpt    	[NONE]
@@ -14767,13 +14727,9 @@ AlmostBuilt   	[NONE]
 
 PsionicStormInit:
 	playfram          	0x00
-	playsnd           	620	# Protoss\TEMPLAR\PTeSto00.WAV
 	tmprmgraphicstart
 	wait              	5
-	sigorder          	1
-PsionicStormDeath:
-	wait              	1
-	end
+	goto                PsionicStormSpecialState2
 
 PsionicStormSpecialState2:
 	tmprmgraphicend
@@ -37158,11 +37114,11 @@ SeekerSporesBounceInit:
 	wait              	1
 SeekerSporesBounceGndAttkInit:
 	sprol             	368 0 0	# Seeker Spores Overlay (thingy\gSmoke.grp)
-	playfram          	0x00	# Frame set 0
-	wait              	1 
+	playfram          	0x00
+	wait              	1
 	sprol             	368 0 0	# Seeker Spores Overlay (thingy\gSmoke.grp)
-	playfram          	1	# Frame set 0, direction 1
-	wait              	1 
+	playfram          	1
+	wait              	1
 	sprol             	368 0 0	# Seeker Spores Overlay (thingy\gSmoke.grp)
 	playfram          	2	# Frame set 0, direction 2
 	wait              	1 
@@ -37177,7 +37133,7 @@ SeekerSporesBounceDeath:
 	domissiledmg
 	if bullet.weapon_id == 163 goto ProtathalorSporesBounceDeath
 	if bullet.weapon_id == 178 goto SpirtithSporesBounceDeath
-	playsnd           	79	# Bullet\ZLuHit00.wav
+	playsnd           	79 # Bullet\ZLuHit00.wav
 	goto				SeekerSporesBounceDeath2
 
 ProtathalorSporesBounceDeath:

patchnotes.md

@@ -21,6 +21,8 @@ Forthcoming.
 	- **The Turning:** (c. Veeq7)
 		- Zombies now attack units within their vision radius
 		- Fallen combatants return throughout the game, spawning at random points on the map
+	- **Uprising:** (c. Veeq7)
+		- Overhauled spawns, from locations to attack waves!
 	- **NEW: Embraced:** (c. Veeq7)
 		- All units and structures are Blissfully Embraced
 		- This gamemode will be iterated on later
@@ -41,6 +43,7 @@ Forthcoming.
 	- Fixed bad cropping on **Zethrokor** and **Quazilisk** burrow graphics
 	- Fixed bad background color on **Ovileth** death graphic
 	- Fixed wrong overlay for Titanic victims of Worship (r. GreenEggs'NSpam)
+	- Pings showing player start locations no longer ping neutral hostile players
 - **User Interface:**
 	- Added **Sasyrvoleth** aura display (r. GreenEggs'NSpam)
 	- Fixed Discord gamemode display for **Duopoly**
@@ -54,8 +57,21 @@ Forthcoming.
 ## Terran
 - **Cornerstone: MASTERS OF NONE:**
 	- When unloaded from a transport, deployed units now perform their deployment animation before being able to operate (c. Veeq7)
+- [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops):
+	- **Flak Cannon** weapon cooldown 1.25 » 1
+	- **Recusion Rounds:**
+		- Now deals unsafe splash, with falloff (24/48/64)
 
 ## Protoss
+- [Cantavis](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cantavis):
+	- **Psionic Storm:** (c. Veeq7)
+		- Cast cost 125 » 25
+		- Damage per second 18 » 26
+		- Max duration 10 seconds » 12 seconds
+		- Now drains energy over time while active
+		- No longer has an initial channeling cast time
+		- Now persists as long as the caster is within cast range, and has energy
+		- Now moves to target location when recast (spending cast energy to do so)
 - [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
 	- HP 300 » 400
 	- Splash radii 12/36/48 » 32/48/64