diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d8061efa..97be7cd9 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index 8bf5619b..23991ab1 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 3a79c2e8..b9b19439 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1931,12 +1931,12 @@ Cikralisk Mutate Vorvrokor Remains Liiralisk Glave Seeker Spores Hit Green Small -Extended Image #931 -Extended Image #932 -Extended Image #933 -Extended Image #934 -Extended Image #935 -Extended Image #936 +Manifold Remains +Golem Remains +Idol Remains +Artisan Remains +Witness Remains +Savant Remains Extended Image #937 Extended Image #938 Extended Image #939 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index ad003ea1..d23d09c8 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 9161a406..0e2b0673 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3136,15 +3136,15 @@ Salamander Weapon 2 Hit 02 Wyvern Weapon Charge 01 Wyvern Weapon Charge 02 Wyvern Weapon Charge 03 -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 +Manifold Death 01 +Manifold Death 02 +Manifold Death 03 +Tethzorokor Weaponfire 01 +Tethzorokor Weaponfire 02 +Tethzorokor Weaponfire 03 +Tethzorokor Weaponfire 04 +Mortothrokor Weaponfire 01 +Mortothrokor Weaponfire 02 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index d90fc281..cbff81a9 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3136,15 +3136,15 @@ cm\t\salamander\wh2-02.wav cm\t\wyvern\charge-01.wav cm\t\wyvern\charge-02.wav cm\t\wyvern\charge-03.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav +cm\p\manifold\dth-01.wav +cm\p\manifold\dth-02.wav +cm\p\manifold\dth-03.wav +cm\z\tethzorokor\wf-01.wav +cm\z\tethzorokor\wf-02.wav +cm\z\tethzorokor\wf-03.wav +cm\z\tethzorokor\wf-04.wav +cm\z\mortothrokor\wf-01.wav +cm\z\mortothrokor\wf-02.wav caw.wav caw.wav caw.wav diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 304a5b8a..298977dd 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 f4fde9b7..c329138f 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -943,12 +943,12 @@ Photon Blasters Green Vorvrokor Remains Liiralisk Glave Seeker Spores Hit Green Small -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Manifold Remains +Golem Remains +Idol Remains +Artisan Remains +Witness Remains +Savant Remains Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 7e34640a..043c9998 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index cc0438d9..c5e9d35f 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -11513,7 +11513,7 @@ WitnessDeath: playsndbtwn 651 652 # Protoss\Witness\PWiDth00.WAV | Protoss\Witness\PWiDth01.WAV imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 847 0 42 # Protoss Unit Rubble Small + lowsprul 949 0 42 # Witness remains wait 1 end @@ -24789,7 +24789,7 @@ SavantDeath: playfram 0x00 imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) wait 2 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + lowsprul 950 0 0 # Savant remains wait 1 end @@ -28549,7 +28549,7 @@ IdolDeath: playsndbtwn 3053 3056 # Idol death 01, 02, 03, 04 imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 847 0 0 # Protoss Unit Rubble Small + lowsprul 947 0 0 # Idol remains (cm\protoss\idol-death.grp) wait 1 end @@ -28640,7 +28640,7 @@ GolemDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 847 0 0 # Protoss Unit Rubble Small + lowsprul 946 0 0 # Golem remains (cm\protoss\golem-death.grp) wait 1 end @@ -29896,10 +29896,10 @@ ManifoldGndAttkToIdle: goto DidactGndAttkToIdle ManifoldDeath: - playsnd 533 # Protoss\Scout\PScDth00.WAV + playsndbtwn 3138 3140 # Manifold death 01, 02, 03 imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 847 0 0 # Protoss Unit Rubble Small + lowsprul 945 0 0 # Manifold remains (cm\protoss\manifold-death.grp) wait 1 end @@ -40935,7 +40935,7 @@ ArtisanDeath: playsnd 598 # Protoss\PROBE\PPrDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 2 - lowsprul 847 0 42 # Protoss Unit Rubble Small + lowsprul 948 0 42 # Artisan remains wait 1 end @@ -44036,7 +44036,7 @@ TethzorokorGndAttkInit: wait 1 nobrkcodestart playfram 0x360 - playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + playsndbtwn 3141 3144 # Tethzorokor weaponfire 01, 02, 03, 04 attackwith 1 wait 1 playfram 0x380 @@ -48858,16 +48858,16 @@ MortothrokorGndAttkRpt: playsndrand 3 891 892 893 # Zerg\Ultra\zulAtt00.WAV | Zerg\Ultra\zulAtt01.WAV | Zerg\Ultra\zulAtt02.WAV wait 1 playfram 0xBB + attackwith 1 + playsndbtwn 3145 3146 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 1 playfram 0xCC - attackwith 1 - playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 1 playfram 0xDD wait 1 playfram 0xEE attackwith 1 - playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + playsndbtwn 3145 3146 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 1 playfram 0xFF wait 1 diff --git a/mpq/sound/cm/p/manifold/dth-01.wav b/mpq/sound/cm/p/manifold/dth-01.wav new file mode 100644 index 00000000..1c453985 Binary files /dev/null and b/mpq/sound/cm/p/manifold/dth-01.wav differ diff --git a/mpq/sound/cm/p/manifold/dth-02.wav b/mpq/sound/cm/p/manifold/dth-02.wav new file mode 100644 index 00000000..094f377a Binary files /dev/null and b/mpq/sound/cm/p/manifold/dth-02.wav differ diff --git a/mpq/sound/cm/p/manifold/dth-03.wav b/mpq/sound/cm/p/manifold/dth-03.wav new file mode 100644 index 00000000..03bdea94 Binary files /dev/null and b/mpq/sound/cm/p/manifold/dth-03.wav differ diff --git a/mpq/sound/cm/z/mortothrokor/wf-01.wav b/mpq/sound/cm/z/mortothrokor/wf-01.wav new file mode 100644 index 00000000..78d0dc57 Binary files /dev/null and b/mpq/sound/cm/z/mortothrokor/wf-01.wav differ diff --git a/mpq/sound/cm/z/mortothrokor/wf-02.wav b/mpq/sound/cm/z/mortothrokor/wf-02.wav new file mode 100644 index 00000000..683f1afd Binary files /dev/null and b/mpq/sound/cm/z/mortothrokor/wf-02.wav differ diff --git a/mpq/sound/cm/z/tethzorokor/wf-01.wav b/mpq/sound/cm/z/tethzorokor/wf-01.wav new file mode 100644 index 00000000..c3304b48 Binary files /dev/null and b/mpq/sound/cm/z/tethzorokor/wf-01.wav differ diff --git a/mpq/sound/cm/z/tethzorokor/wf-02.wav b/mpq/sound/cm/z/tethzorokor/wf-02.wav new file mode 100644 index 00000000..65fce366 Binary files /dev/null and b/mpq/sound/cm/z/tethzorokor/wf-02.wav differ diff --git a/mpq/sound/cm/z/tethzorokor/wf-03.wav b/mpq/sound/cm/z/tethzorokor/wf-03.wav new file mode 100644 index 00000000..6778c730 Binary files /dev/null and b/mpq/sound/cm/z/tethzorokor/wf-03.wav differ diff --git a/mpq/sound/cm/z/tethzorokor/wf-04.wav b/mpq/sound/cm/z/tethzorokor/wf-04.wav new file mode 100644 index 00000000..cf809a1e Binary files /dev/null and b/mpq/sound/cm/z/tethzorokor/wf-04.wav differ diff --git a/mpq/templates/Duopoly(1).got b/mpq/templates/Duopoly(1).got new file mode 100644 index 00000000..e00900de Binary files /dev/null and b/mpq/templates/Duopoly(1).got differ diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst index 762ff02f..7e4222ff 100644 --- a/mpq/templates/templates.lst +++ b/mpq/templates/templates.lst @@ -5,4 +5,5 @@ "Massacre(1).got" "The Turning(1).got" "Uprising(1).got" +"Duopoly(1).got" "Debug(1).got" \ No newline at end of file diff --git a/mpq/unit/cm/protoss/artisan-death.grp b/mpq/unit/cm/protoss/artisan-death.grp new file mode 100644 index 00000000..5b418fdd Binary files /dev/null and b/mpq/unit/cm/protoss/artisan-death.grp differ diff --git a/mpq/unit/cm/protoss/golem-death.grp b/mpq/unit/cm/protoss/golem-death.grp new file mode 100644 index 00000000..985fa47a Binary files /dev/null and b/mpq/unit/cm/protoss/golem-death.grp differ diff --git a/mpq/unit/cm/protoss/idol-death.grp b/mpq/unit/cm/protoss/idol-death.grp new file mode 100644 index 00000000..8dc28208 Binary files /dev/null and b/mpq/unit/cm/protoss/idol-death.grp differ diff --git a/mpq/unit/cm/protoss/manifold-death.grp b/mpq/unit/cm/protoss/manifold-death.grp new file mode 100644 index 00000000..62f873b7 Binary files /dev/null and b/mpq/unit/cm/protoss/manifold-death.grp differ diff --git a/mpq/unit/cm/protoss/witness-death.grp b/mpq/unit/cm/protoss/witness-death.grp new file mode 100644 index 00000000..f7fe5796 Binary files /dev/null and b/mpq/unit/cm/protoss/witness-death.grp differ diff --git a/mpq/unit/cm/terran/savant-death.grp b/mpq/unit/cm/terran/savant-death.grp new file mode 100644 index 00000000..c220c1b0 Binary files /dev/null and b/mpq/unit/cm/terran/savant-death.grp differ diff --git a/mpq/unit/terran/cleric-death.grp b/mpq/unit/terran/cleric-death.grp new file mode 100644 index 00000000..9cb0a956 Binary files /dev/null and b/mpq/unit/terran/cleric-death.grp differ diff --git a/patchnotes.md b/patchnotes.md index ee6d1ec3..9a7e4bad 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,5 +1,6 @@ -# 2X July 2024 +# 20 July 2024 ## Year 2, month 7, patch 2 +## Tyrant's Tale qualifier This patch will include bugfixes, audiovisual improvements, and balance adjustments. @@ -17,6 +18,11 @@ Forthcoming. - **Config:** - New option: `show_ingame_global_queue` (c. Veeq7) - If enabled, displays the production queue from Witness and Replay modes for yourself and your allies +- **Game Modes:** + - **Omnipresence:** + - Reset to previous version where all 3 races are controlled at once + - **NEW: Duopoly:** + - Selecting one race gives 2 races to control ## Bugfixes - Stability: @@ -30,4 +36,16 @@ Forthcoming. - Resolved mnemonic keyboard shortcut conflicts between Burrow and Okrimnilisk / Sovroleth morphs (r. lolrsk8s & jakulangski) - Ultrokor death animation no longer prints an iscript error (r. jakulangski) - Vengeance and Ascension buff timers are now displayed on the armor tooltip (r. lolrsk8s) - - Help tooltips have been updated (r. jakulangski) \ No newline at end of file + - Help tooltips have been updated (r. jakulangski) + +## Audiovisuals +- Added new corpses for: + - Savant, Manifold, Golem, Idol, Artisan, Witness +- Updated corpses for: + - Cleric +- New death SFX for: + - Manifold (c. lolrsk8s) +- New weapon fire SFX for: + - Tethzorokor (c. lolrsk8s) +- New weapon hit SFX for: + - Mortothrokor (c. lolrsk8s) \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 25c9d4b5..af34ef30 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ