diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index c766a4fb..c78f1ccd 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 227164dd..80a08ebc 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -464,8 +464,8 @@ Ezigrisant Wellbore Police Deputy Cuirass (Trench Mode) -Spirtith Colony -Skortrith Colony +Spirtith Cesiant +Skortrith Cesiant Empress Plasma Engram Hammerfall Beacon @@ -525,7 +525,7 @@ Skithrokor Spore Photon Blasters White Photon Blasters Green Liiralisk Glave -Extended Flingy #319 +Evigrilisk Tentacle Extended Flingy #320 Extended Flingy #321 Extended Flingy #322 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 97be7cd9..79f0822c 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index b9b19439..df804c76 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1937,7 +1937,7 @@ Idol Remains Artisan Remains Witness Remains Savant Remains -Extended Image #937 +Evigrilisk Tentacle Extended Image #938 Extended Image #939 Extended Image #940 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 70d7c6e8..128a89bf 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 b423f2a3..77cfe1de 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3164,19 +3164,19 @@ Cataphract Under Attack 01 Cataphract Under Attack 02 Cataphract Under Attack 03 Cataphract Under Attack 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Evigrilisk Weaponhit 01 +Evigrilisk Weaponhit 02 +Evigrilisk Weaponhit 03 +Epigraph Weaponhit 01 +Epigraph Weaponhit 02 +Gorgrokor Weaponhit 01 +Gorgrokor Weaponhit 02 +Gorgrokor Weaponhit 03 +Gorgrokor Weaponhit 04 +Tosgrilisk Weaponhit 01 +Tosgrilisk Weaponhit 02 +Tosgrilisk Weaponhit 03 +Ramesses Weaponhit 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 4367e7de..258749a5 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1896,9 +1896,9 @@ cm\z\kagralisk\wfire-01.wav cm\z\kagralisk\ready-01.wav cm\p\legionnaire\wf-01.wav cm\p\legionnaire\wh-01.wav -cm\z\evigrilisk\wfire-01.wav -cm\z\evigrilisk\wfire-02.wav -cm\z\evigrilisk\wfire-03.wav +cm\z\evigrilisk\wf-01.wav +cm\z\evigrilisk\wf-02.wav +cm\z\evigrilisk\wf-03.wav cm\z\evigrilisk\ready-01.wav cm\p\dracadin\revive-01.wav caw.wav @@ -3164,21 +3164,21 @@ cm\t\cataphract\hlp-01.wav cm\t\cataphract\hlp-02.wav cm\t\cataphract\hlp-03.wav cm\t\cataphract\hlp-04.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav +cm\z\evigrilisk\wh-01.wav +cm\z\evigrilisk\wh-02.wav +cm\z\evigrilisk\wh-03.wav +cm\p\epigraph\wh-01.wav +cm\p\epigraph\wh-02.wav +cm\z\gorgrokor\wh-01.wav +cm\z\gorgrokor\wh-02.wav +cm\z\gorgrokor\wh-03.wav +cm\z\gorgrokor\wh-04.wav +cm\z\tosgrilisk\wh-01.wav +cm\z\tosgrilisk\wh-02.wav +cm\z\tosgrilisk\wh-03.wav +cm\t\ramesses\wh-01.wav +cm\t\ramesses\wh-02.wav +cm\t\ramesses\wh-03.wav caw.wav caw.wav caw.wav diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 298977dd..daeabaa3 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index c329138f..9194698d 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -949,7 +949,7 @@ Idol Remains Artisan Remains Witness Remains Savant Remains -Extended Sprite #1 +Evigrilisk Tentacle Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index de6aa9ce..8f027acf 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 2941ffcb..3e6e7805 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index c5e9d35f..70748736 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -165,9 +165,10 @@ RilirokorGndAttkToIdle: goto RilirokorGndAttkToIdle RilirokorDeath: + wait 1 randcondjmp 51 RilirokorDeathFinal wait 1 - waitrand 1 3 + waitrand 1 2 goto RilirokorDeathFinal RilirokorDeathFinal: imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) @@ -15064,12 +15065,17 @@ ATA_ATSLaserBattery_BurstLasersInit: ATA_ATSLaserBattery_BurstLasersDeath: imgol 447 0 0 # Burst Lasers Hit (thingy\elbHit.grp) domissiledmg + if bullet.weapon_id == 170 goto ATA_ATSLaserBattery_BurstLasersRamesses if bullet.weapon_id == 173 goto ATA_ATSLaserBattery_BurstLasersCataphract playsnd 77 # Bullet\LASRHIT3.wav goto ATA_ATSLaserBattery_BurstLasersDeath2 ATA_ATSLaserBattery_BurstLasersCataphract: - playsndbtwn 2518 2520 # Cataphract weapon hit 01, 02, 03 + playsndbtwn 2518 2520 # Cataphract weaponhit 01, 02, 03 + goto ATA_ATSLaserBattery_BurstLasersDeath2 + +ATA_ATSLaserBattery_BurstLasersRamesses: + playsnd 3178 # Ramesses weaponhit 01 ATA_ATSLaserBattery_BurstLasersDeath2: wait 1 end @@ -22808,7 +22814,7 @@ GorgrokorGndAttkInit: wait 1 playfram 0x180 attackwith 1 - playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + playsndbtwn 3171 3174 # Gorgrokor weaponhit 01, 02, 03, 04 wait 1 playfram 0x1A0 wait 1 @@ -32442,22 +32448,23 @@ QuaziliskLocal06: goto QuaziliskGndAttkToIdle QuaziliskDeath: + imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) playsndbtwn 1707 1708 # Quazilisk death 01, 02 setfldirect 0 playfram 672 - wait 2 + wait 1 playfram 673 - wait 2 + wait 1 playfram 674 - wait 2 + wait 1 playfram 675 - wait 2 + wait 1 playfram 676 - wait 2 + wait 1 playfram 677 - wait 2 + wait 1 playfram 678 - wait 2 + wait 1 lowsprul 814 0 0 # Quazilisk Remains wait 1 end @@ -36652,6 +36659,12 @@ BurstLasersBlueSilentInit: BurstLasersBlueSilentDeath: imgol 1249 0 0 # Burst Lasers Blue Hit Damaging (thingy\elbHit.grp) + if bullet.weapon_id == 132 goto BurstLasersBlueSilentEpigraphDeath + wait 1 + end + +BurstLasersBlueSilentEpigraphDeath: + playsndbtwn 3169 3170 # Epigraph weaponhit 01, 02 wait 1 end @@ -39954,16 +39967,27 @@ IzirokorEnergyGndAttkInit: goto IzirokorEnergyGndAttkInit IzirokorEnergyDeath: - playsnd 93 # Bullet\ZQuHit02.wav sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg + if bullet.weapon_id == 165 goto TosgriliskEnergyDeath + playsnd 93 # Bullet\ZQuHit02.wav + wait 1 + end + +TosgriliskEnergyDeath: + playsndbtwn 3175 3177 # Tosgrilisk weaponhit 01, 02, 03 wait 1 end IzirokorEnergySpecialState1: - playsndbtwn 91 92 # Bullet\ZQuHit00.wav | Bullet\ZQuHit01.wav sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg + if bullet.weapon_id == 165 goto TosgriliskEnergySpecialState1 + playsndbtwn 91 92 # Bullet\ZQuHit00.wav | Bullet\ZQuHit01.wav + goto IzirokorEnergyGndAttkInit + +TosgriliskEnergySpecialState1: + playsndbtwn 3175 3177 # Tosgrilisk weaponhit 01, 02, 03 goto IzirokorEnergyGndAttkInit # ----------------------------------------------------------------------------- # @@ -43369,7 +43393,7 @@ ZarcavrokorGndAttkInit: wait 1 playfram 0x160 attackwith 1 - playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + playsndbtwn 3171 3174 # Gorgrokor weaponhit 01, 02, 03, 04 wait 1 playfram 0x180 wait 1 @@ -51949,5 +51973,25 @@ LiiraliskGlaveSpecialState1: sprol 944 0 0 # Spore Hit Green Small (cm\zerg\spore-hit-green-small.grp) domissiledmg goto GlaveWurmGndAttkInit + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1766 Evigrilisk Tentacle (bullet\Tentacle.grp) +.headerstart +IsId 796 +Type 2 +Init EvigriliskTentacleInit +Death SubterraneanTentacleDeath +GndAttkInit SubterraneanTentacleDeath +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +EvigriliskTentacleInit: + playsndbtwn 3166 3168 # Evigrilisk weaponhit 01, 02, 03 + wait 1 + sigorder 1 + wait 1 + goto SubterraneanTentacleDeath -## Next free IsId: 795 \ No newline at end of file +## Next free IsId: 797 \ No newline at end of file diff --git a/mpq/sound/cm/p/epigraph/wh-01.wav b/mpq/sound/cm/p/epigraph/wh-01.wav new file mode 100644 index 00000000..b7bb1c49 Binary files /dev/null and b/mpq/sound/cm/p/epigraph/wh-01.wav differ diff --git a/mpq/sound/cm/p/epigraph/wh-02.wav b/mpq/sound/cm/p/epigraph/wh-02.wav new file mode 100644 index 00000000..94e49587 Binary files /dev/null and b/mpq/sound/cm/p/epigraph/wh-02.wav differ diff --git a/mpq/sound/cm/t/ramesses/wh-01.wav b/mpq/sound/cm/t/ramesses/wh-01.wav new file mode 100644 index 00000000..19bcad9d Binary files /dev/null and b/mpq/sound/cm/t/ramesses/wh-01.wav differ diff --git a/mpq/sound/cm/z/evigrilisk/wfire-01.wav b/mpq/sound/cm/z/evigrilisk/wf-01.wav similarity index 100% rename from mpq/sound/cm/z/evigrilisk/wfire-01.wav rename to mpq/sound/cm/z/evigrilisk/wf-01.wav diff --git a/mpq/sound/cm/z/evigrilisk/wfire-02.wav b/mpq/sound/cm/z/evigrilisk/wf-02.wav similarity index 100% rename from mpq/sound/cm/z/evigrilisk/wfire-02.wav rename to mpq/sound/cm/z/evigrilisk/wf-02.wav diff --git a/mpq/sound/cm/z/evigrilisk/wfire-03.wav b/mpq/sound/cm/z/evigrilisk/wf-03.wav similarity index 100% rename from mpq/sound/cm/z/evigrilisk/wfire-03.wav rename to mpq/sound/cm/z/evigrilisk/wf-03.wav diff --git a/mpq/sound/cm/z/evigrilisk/wh-01.wav b/mpq/sound/cm/z/evigrilisk/wh-01.wav new file mode 100644 index 00000000..0699ee74 Binary files /dev/null and b/mpq/sound/cm/z/evigrilisk/wh-01.wav differ diff --git a/mpq/sound/cm/z/evigrilisk/wh-02.wav b/mpq/sound/cm/z/evigrilisk/wh-02.wav new file mode 100644 index 00000000..d8606bbb Binary files /dev/null and b/mpq/sound/cm/z/evigrilisk/wh-02.wav differ diff --git a/mpq/sound/cm/z/evigrilisk/wh-03.wav b/mpq/sound/cm/z/evigrilisk/wh-03.wav new file mode 100644 index 00000000..7a776f20 Binary files /dev/null and b/mpq/sound/cm/z/evigrilisk/wh-03.wav differ diff --git a/mpq/sound/cm/z/gorgrokor/wh-01.wav b/mpq/sound/cm/z/gorgrokor/wh-01.wav new file mode 100644 index 00000000..1ac8db8a Binary files /dev/null and b/mpq/sound/cm/z/gorgrokor/wh-01.wav differ diff --git a/mpq/sound/cm/z/gorgrokor/wh-02.wav b/mpq/sound/cm/z/gorgrokor/wh-02.wav new file mode 100644 index 00000000..25fcea47 Binary files /dev/null and b/mpq/sound/cm/z/gorgrokor/wh-02.wav differ diff --git a/mpq/sound/cm/z/gorgrokor/wh-03.wav b/mpq/sound/cm/z/gorgrokor/wh-03.wav new file mode 100644 index 00000000..6cb75677 Binary files /dev/null and b/mpq/sound/cm/z/gorgrokor/wh-03.wav differ diff --git a/mpq/sound/cm/z/gorgrokor/wh-04.wav b/mpq/sound/cm/z/gorgrokor/wh-04.wav new file mode 100644 index 00000000..5049fde4 Binary files /dev/null and b/mpq/sound/cm/z/gorgrokor/wh-04.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wh-01.wav b/mpq/sound/cm/z/tosgrilisk/wh-01.wav new file mode 100644 index 00000000..549568d2 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wh-01.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wh-02.wav b/mpq/sound/cm/z/tosgrilisk/wh-02.wav new file mode 100644 index 00000000..da22da60 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wh-02.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wh-03.wav b/mpq/sound/cm/z/tosgrilisk/wh-03.wav new file mode 100644 index 00000000..4017e08f Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wh-03.wav differ diff --git a/mpq/unit/cm/zerg/quazilisk.grp b/mpq/unit/cm/zerg/quazilisk.grp index 01a93e0b..d13eb031 100644 Binary files a/mpq/unit/cm/zerg/quazilisk.grp and b/mpq/unit/cm/zerg/quazilisk.grp differ diff --git a/mpq/unit/zerg/zethrokor.grp b/mpq/unit/zerg/zethrokor.grp index 5a7c2bb9..996c6f89 100644 Binary files a/mpq/unit/zerg/zethrokor.grp and b/mpq/unit/zerg/zethrokor.grp differ diff --git a/patchnotes.md b/patchnotes.md index 11ea7246..acd1efe4 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,4 +1,4 @@ -# 27 July 2024 +# XX August ## Year 2, month 7, patch 3 ## Tyrant's Tale - main stage @@ -33,12 +33,14 @@ Forthcoming. - **Hypnagogue** - **Through the Looking Glass**: - No longer flips allied positions (r. GreenEggs'NSpam, c. Veeq7) - No longer fails to teleport Hypnagogue when solo (r. GreenEggs'NSpam) + - Lardfix: **Lakizilisks** can now attack while in a garrison - In **Massacre** mode, cancelling a Zerg structure no longer gives vespene (r. Btyb) - Fixed height flags on Iceworld -> ice doodads (r. TheBeaver99) - **Audiovisuals:** - **Vengeance** no longer creates overlyas on stationary structures - - Fixed bad cropping on **Zethrokor** burrow graphic + - 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) - **User Interface:** - Added **Sasyrvoleth** aura display (r. GreenEggs'NSpam) - Fixed Discord gamemode display for **Duopoly** @@ -46,7 +48,14 @@ Forthcoming. ## Audiovisuals - New unit responses for: - Cataphract +- New weaponhit SFX for: + - Ramesses, Epigraph, Tosgrilisk, Evigrilisk, Gorgrokor (c. lolrsk8s) ## Terran - **Cornerstone: MASTERS OF NONE:** - - When unloaded from a transport, deployed units now perform their deployment animation before being able to operate (c. Veeq7) \ No newline at end of file + - When unloaded from a transport, deployed units now perform their deployment animation before being able to operate (c. Veeq7) + +## Protoss +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - HP 300 » 400 + - Splash radii 12/36/48 » 32/48/64 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 990c6ead..4a322b58 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ