diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index df5bec8e..124ee60b 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index c0ef4e18..f0bb62cc 100644 --- a/mpq/arr/sfxdata.txt +++ b/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 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 40d1665e..09fcaa80 100644 --- a/mpq/arr/sounds.txt +++ b/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 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index ed45a142..2e9046de 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 3e6e7805..3f0e7295 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index 5c95d40e..af43bfa5 100644 --- a/mpq/arr/weapons.txt +++ b/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 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 75e7f2cd..e609e943 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 62da4732..3bd44cb7 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 70748736..6c378fbd 100644 --- a/mpq/scripts/iscript.txt +++ b/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: diff --git a/mpq/sound/protoss/templar/psionic-storm-end-01.wav b/mpq/sound/protoss/templar/psionic-storm-end-01.wav new file mode 100644 index 00000000..4a586818 Binary files /dev/null and b/mpq/sound/protoss/templar/psionic-storm-end-01.wav differ diff --git a/mpq/sound/protoss/templar/psionic-storm-loop-01.wav b/mpq/sound/protoss/templar/psionic-storm-loop-01.wav new file mode 100644 index 00000000..eb624cef Binary files /dev/null and b/mpq/sound/protoss/templar/psionic-storm-loop-01.wav differ diff --git a/mpq/sound/protoss/templar/psionic-storm-start-01.wav b/mpq/sound/protoss/templar/psionic-storm-start-01.wav new file mode 100644 index 00000000..09690170 Binary files /dev/null and b/mpq/sound/protoss/templar/psionic-storm-start-01.wav differ diff --git a/mpq/sound/protoss/templar/psionic-storm-start-02.wav b/mpq/sound/protoss/templar/psionic-storm-start-02.wav new file mode 100644 index 00000000..07458de2 Binary files /dev/null and b/mpq/sound/protoss/templar/psionic-storm-start-02.wav differ diff --git a/mpq/tileset/platform.vf4 b/mpq/tileset/platform.vf4 index 3a4a7c05..ab5ab794 100644 Binary files a/mpq/tileset/platform.vf4 and b/mpq/tileset/platform.vf4 differ diff --git a/mpq/unit/thingy/tileset/jungle/jubush1s.grp b/mpq/unit/thingy/tileset/jungle/jubush1s.grp new file mode 100644 index 00000000..6b730091 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/jubush1s.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/jubush3s.grp b/mpq/unit/thingy/tileset/jungle/jubush3s.grp new file mode 100644 index 00000000..2dbc99cc Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/jubush3s.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/jubush5s.grp b/mpq/unit/thingy/tileset/jungle/jubush5s.grp new file mode 100644 index 00000000..90dbbea8 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/jubush5s.grp differ diff --git a/patchnotes.md b/patchnotes.md index 91eaf35e..1b306dda 100644 --- a/patchnotes.md +++ b/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 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index bd8eeb57..c7cf8de2 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ