diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index a2ff38fa..24bbf703 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 f7338017..033388a7 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2474,8 +2474,8 @@ Apostle Toggle Lazarus 03 Shaman Visionary 01 Shaman Visionary 02 Shaman Support 01 -Extended Sound #1 -Extended Sound #1 +Protoss Advisor Error - Placement +Protoss Advisor Update - Structure Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index c24559ef..452e9f13 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2473,4 +2473,6 @@ cm\t\apostle\toggle-02.wav cm\t\apostle\toggle-03.wav cm\t\shaman\switch-01.wav cm\t\shaman\switch-02.wav -cm\t\shaman\switch-03.wav \ No newline at end of file +cm\t\shaman\switch-03.wav +protoss\advisor\paderr03.wav +protoss\advisor\padupd03.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index ec7776f0..2679d97d 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/music/terran1.wav b/mpq/music/terran1.wav new file mode 100644 index 00000000..d7204160 Binary files /dev/null and b/mpq/music/terran1.wav differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 859b9319..f122b1ad 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -25345,19 +25345,19 @@ TreasuryIsWorking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1060 Treasury Overlay (cm\effect\treasury-overlay.grp) +# 1060 Khaydarin Charge Overlay (cm\effect\treasury-overlay.grp) .headerstart IsId 440 Type 1 -Init TreasuryEnhanceInit -Death TreasuryEnhanceDeath +Init KhaydarinChargeInit +Death KhaydarinChargeDeath .headerend # ----------------------------------------------------------------------------- # -TreasuryEnhanceInit: +KhaydarinChargeInit: playfram 0x00 wait 2 -TreasuryEnhanceLocal00: +KhaydarinChargeLocal00: playfram 1 wait 2 playfram 3 @@ -25390,9 +25390,9 @@ TreasuryEnhanceLocal00: wait 2 playfram 1 wait 2 - goto TreasuryEnhanceDeath + goto KhaydarinChargeDeath -TreasuryEnhanceDeath: +KhaydarinChargeDeath: wait 1 end diff --git a/mpq/sound/cm/t/alert-t.wav b/mpq/sound/cm/t/alert-t.wav index 3c64dcd1..aa8488f2 100644 Binary files a/mpq/sound/cm/t/alert-t.wav and b/mpq/sound/cm/t/alert-t.wav differ diff --git a/mpq/sound/protoss/advisor/pad-ally-p.wav b/mpq/sound/protoss/advisor/pad-ally-p.wav index 360cc277..a1ca83e8 100644 Binary files a/mpq/sound/protoss/advisor/pad-ally-p.wav and b/mpq/sound/protoss/advisor/pad-ally-p.wav differ diff --git a/mpq/sound/protoss/advisor/pad-ally-t.wav b/mpq/sound/protoss/advisor/pad-ally-t.wav index 773050a3..43785cc1 100644 Binary files a/mpq/sound/protoss/advisor/pad-ally-t.wav and b/mpq/sound/protoss/advisor/pad-ally-t.wav differ diff --git a/mpq/sound/protoss/advisor/pad-ally-z.wav b/mpq/sound/protoss/advisor/pad-ally-z.wav index 85543343..eeeab0c8 100644 Binary files a/mpq/sound/protoss/advisor/pad-ally-z.wav and b/mpq/sound/protoss/advisor/pad-ally-z.wav differ diff --git a/mpq/sound/protoss/advisor/paderr00.wav b/mpq/sound/protoss/advisor/paderr00.wav new file mode 100644 index 00000000..aa0333d6 Binary files /dev/null and b/mpq/sound/protoss/advisor/paderr00.wav differ diff --git a/mpq/sound/protoss/advisor/paderr01.wav b/mpq/sound/protoss/advisor/paderr01.wav new file mode 100644 index 00000000..fb24c866 Binary files /dev/null and b/mpq/sound/protoss/advisor/paderr01.wav differ diff --git a/mpq/sound/protoss/advisor/paderr03.wav b/mpq/sound/protoss/advisor/paderr03.wav new file mode 100644 index 00000000..912e9ce2 Binary files /dev/null and b/mpq/sound/protoss/advisor/paderr03.wav differ diff --git a/mpq/sound/protoss/advisor/paderr06.wav b/mpq/sound/protoss/advisor/paderr06.wav new file mode 100644 index 00000000..2d2316b8 Binary files /dev/null and b/mpq/sound/protoss/advisor/paderr06.wav differ diff --git a/mpq/sound/protoss/advisor/padupd00.wav b/mpq/sound/protoss/advisor/padupd00.wav new file mode 100644 index 00000000..b7f5c47b Binary files /dev/null and b/mpq/sound/protoss/advisor/padupd00.wav differ diff --git a/mpq/sound/protoss/advisor/padupd01.wav b/mpq/sound/protoss/advisor/padupd01.wav new file mode 100644 index 00000000..a0ecb9e2 Binary files /dev/null and b/mpq/sound/protoss/advisor/padupd01.wav differ diff --git a/mpq/sound/protoss/advisor/padupd03.wav b/mpq/sound/protoss/advisor/padupd03.wav new file mode 100644 index 00000000..6ff01b9e Binary files /dev/null and b/mpq/sound/protoss/advisor/padupd03.wav differ diff --git a/mpq/sound/protoss/advisor/padupd04.wav b/mpq/sound/protoss/advisor/padupd04.wav new file mode 100644 index 00000000..db4e632a Binary files /dev/null and b/mpq/sound/protoss/advisor/padupd04.wav differ diff --git a/mpq/sound/terran/advisor/tad-ally-p.wav b/mpq/sound/terran/advisor/tad-ally-p.wav index 8beabb4e..29c06b71 100644 Binary files a/mpq/sound/terran/advisor/tad-ally-p.wav and b/mpq/sound/terran/advisor/tad-ally-p.wav differ diff --git a/mpq/sound/terran/advisor/tad-ally-t.wav b/mpq/sound/terran/advisor/tad-ally-t.wav index 0b17f475..8a76ff7a 100644 Binary files a/mpq/sound/terran/advisor/tad-ally-t.wav and b/mpq/sound/terran/advisor/tad-ally-t.wav differ diff --git a/mpq/sound/terran/advisor/tad-ally-z.wav b/mpq/sound/terran/advisor/tad-ally-z.wav index 4137f50e..b3901545 100644 Binary files a/mpq/sound/terran/advisor/tad-ally-z.wav and b/mpq/sound/terran/advisor/tad-ally-z.wav differ diff --git a/mpq/sound/terran/advisor/taderr00.wav b/mpq/sound/terran/advisor/taderr00.wav new file mode 100644 index 00000000..db998252 Binary files /dev/null and b/mpq/sound/terran/advisor/taderr00.wav differ diff --git a/mpq/sound/terran/advisor/taderr01.wav b/mpq/sound/terran/advisor/taderr01.wav new file mode 100644 index 00000000..ffe7db5e Binary files /dev/null and b/mpq/sound/terran/advisor/taderr01.wav differ diff --git a/mpq/sound/terran/advisor/taderr03.wav b/mpq/sound/terran/advisor/taderr03.wav new file mode 100644 index 00000000..07fdc2f1 Binary files /dev/null and b/mpq/sound/terran/advisor/taderr03.wav differ diff --git a/mpq/sound/terran/advisor/taderr04.wav b/mpq/sound/terran/advisor/taderr04.wav new file mode 100644 index 00000000..011ec293 Binary files /dev/null and b/mpq/sound/terran/advisor/taderr04.wav differ diff --git a/mpq/sound/terran/advisor/taderr06.wav b/mpq/sound/terran/advisor/taderr06.wav new file mode 100644 index 00000000..67a8c8ec Binary files /dev/null and b/mpq/sound/terran/advisor/taderr06.wav differ diff --git a/mpq/sound/terran/advisor/tadupd00.wav b/mpq/sound/terran/advisor/tadupd00.wav index c0fca5d6..1b3ae814 100644 Binary files a/mpq/sound/terran/advisor/tadupd00.wav and b/mpq/sound/terran/advisor/tadupd00.wav differ diff --git a/mpq/sound/terran/advisor/tadupd01.wav b/mpq/sound/terran/advisor/tadupd01.wav index cc3e1b43..ddf6d382 100644 Binary files a/mpq/sound/terran/advisor/tadupd01.wav and b/mpq/sound/terran/advisor/tadupd01.wav differ diff --git a/mpq/sound/terran/advisor/tadupd03.wav b/mpq/sound/terran/advisor/tadupd03.wav new file mode 100644 index 00000000..948166a5 Binary files /dev/null and b/mpq/sound/terran/advisor/tadupd03.wav differ diff --git a/mpq/sound/terran/advisor/tadupd04.wav b/mpq/sound/terran/advisor/tadupd04.wav new file mode 100644 index 00000000..b3e32289 Binary files /dev/null and b/mpq/sound/terran/advisor/tadupd04.wav differ diff --git a/mpq/sound/terran/advisor/tadupd07.wav b/mpq/sound/terran/advisor/tadupd07.wav new file mode 100644 index 00000000..df163ffe Binary files /dev/null and b/mpq/sound/terran/advisor/tadupd07.wav differ diff --git a/mpq/unit/cm/protoss/manifold.grp b/mpq/unit/cm/protoss/manifold.grp index b6a153ac..8ce105f0 100644 Binary files a/mpq/unit/cm/protoss/manifold.grp and b/mpq/unit/cm/protoss/manifold.grp differ diff --git a/mpq/unit/cm/protoss/vagrant.grp b/mpq/unit/cm/protoss/vagrant.grp index 3ec9a973..052d82fb 100644 Binary files a/mpq/unit/cm/protoss/vagrant.grp and b/mpq/unit/cm/protoss/vagrant.grp differ diff --git a/patchnotes.md b/patchnotes.md index 42677144..103e6af5 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -21,6 +21,8 @@ We are now testing a revised method of handling stuns. If you find any bugs with - A new config option, "draw aura circles", has arrived! This feature is still being worked on, and the previews are not currently accurate to the exact shape of BW's ranges. ## Audiovisuals +- Advisors have been replaced for Terran and Protoss +- New notifications have been defined for improper Protoss placement, and Protoss structure completion - Improved sprites for: - Madrigal (texture shading now a closer match) - Vagrant (now different from Shade) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 113bef93..3193fcf1 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ