diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 752e09dc..676a53ba 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 0ca7c147..5c84c8ef 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2620,45 +2620,45 @@ Hotshot Weaponfire 02 Sentinel Weaponfire 01 Sentinel Weaponfire 02 Sentinel Weaponfire 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 -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 -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 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Ackmed Advisor Addon 01 +Ackmed Advisor Addon 02 +Ackmed Advisor Protoss Under Attack 01 +Ackmed Advisor Protoss Under Attack 02 +Ackmed Advisor Protoss Under Attack 03 +Ackmed Advisor Terran Under Attack 01 +Ackmed Advisor Terran Under Attack 02 +Ackmed Advisor Terran Under Attack 03 +Ackmed Advisor Zerg Under Attack 01 +Ackmed Advisor Zerg Under Attack 02 +Ackmed Advisor Zerg Under Attack 03 +Ackmed Advisor Army Under Attack 01 +Ackmed Advisor Army Under Attack 02 +Ackmed Advisor Army Under Attack 03 +Ackmed Advisor Base Under Attack 01 +Ackmed Advisor Base Under Attack 02 +Ackmed Advisor Base Under Attack 03 +Ackmed Advisor No Energy 01 +Ackmed Advisor No Energy 02 +Ackmed Advisor No Energy 03 +Ackmed Advisor No Energy 04 +Ackmed Advisor Landing Interrupted 01 +Ackmed Advisor Landing Interrupted 02 +Ackmed Advisor No Minerals 01 +Ackmed Advisor No Minerals 02 +Ackmed Advisor No Minerals 03 +Ackmed Advisor No Minerals 04 +Ackmed Advisor Missile Armed 01 +Ackmed Advisor Missile Armed 02 +Ackmed Advisor Missile Launch 01 +Ackmed Advisor Missile Launch 02 +Ackmed Advisor No Build 01 +Ackmed Advisor No Build 02 +Ackmed Advisor No Vespene 01 +Ackmed Advisor No Vespene 02 +Ackmed Advisor No Vespene 03 +Ackmed Advisor No Vespene 04 +Ackmed Advisor Warp 01 +Ackmed Advisor Warp 02 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 21150c2b..fd933d44 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2619,4 +2619,48 @@ cm\f\hotshot\wf-01.wav cm\f\hotshot\wf-02.wav cm\t\sentinel\wf-01.wav cm\t\sentinel\wf-02.wav -cm\t\sentinel\wf-03.wav \ No newline at end of file +cm\t\sentinel\wf-03.wav +cm\advisors\ackmed\ackmedad_addon-01.wav +cm\advisors\ackmed\ackmedad_addon-02.wav +cm\advisors\ackmed\ackmedad_allyattack-p-01.wav +cm\advisors\ackmed\ackmedad_allyattack-p-02.wav +cm\advisors\ackmed\ackmedad_allyattack-p-03.wav +cm\advisors\ackmed\ackmedad_allyattack-t-01.wav +cm\advisors\ackmed\ackmedad_allyattack-t-02.wav +cm\advisors\ackmed\ackmedad_allyattack-t-03.wav +cm\advisors\ackmed\ackmedad_allyattack-z-01.wav +cm\advisors\ackmed\ackmedad_allyattack-z-02.wav +cm\advisors\ackmed\ackmedad_allyattack-z-03.wav +cm\advisors\ackmed\ackmedad_armyattack-01.wav +cm\advisors\ackmed\ackmedad_armyattack-02.wav +cm\advisors\ackmed\ackmedad_armyattack-03.wav +cm\advisors\ackmed\ackmedad_baseattack-01.wav +cm\advisors\ackmed\ackmedad_baseattack-02.wav +cm\advisors\ackmed\ackmedad_baseattack-03.wav +cm\advisors\ackmed\ackmedad_energy-01.wav +cm\advisors\ackmed\ackmedad_energy-02.wav +cm\advisors\ackmed\ackmedad_energy-03.wav +cm\advisors\ackmed\ackmedad_energy-04.wav +cm\advisors\ackmed\ackmedad_intland-01.wav +cm\advisors\ackmed\ackmedad_intland-02.wav +cm\advisors\ackmed\ackmedad_minerals-01.wav +cm\advisors\ackmed\ackmedad_minerals-02.wav +cm\advisors\ackmed\ackmedad_minerals-03.wav +cm\advisors\ackmed\ackmedad_minerals-04.wav +cm\advisors\ackmed\ackmedad_missile-01.wav +cm\advisors\ackmed\ackmedad_missile-02.wav +cm\advisors\ackmed\ackmedad_missilelaunch-01.wav +cm\advisors\ackmed\ackmedad_missilelaunch-02.wav +cm\advisors\ackmed\ackmedad_nobuild-01.wav +cm\advisors\ackmed\ackmedad_nobuild-02.wav +cm\advisors\ackmed\ackmedad_noland-01.wav +cm\advisors\ackmed\ackmedad_noland-02.wav +cm\advisors\ackmed\ackmedad_nowarp-01.wav +cm\advisors\ackmed\ackmedad_nowarp-02.wav +cm\advisors\ackmed\ackmedad_tech-01.wav +cm\advisors\ackmed\ackmedad_tech-02.wav +cm\advisors\ackmed\ackmedad_vespene-01.wav +cm\advisors\ackmed\ackmedad_vespene-02.wav +cm\advisors\ackmed\ackmedad_vespene-03.wav +cm\advisors\ackmed\ackmedad_vespene-04.wav +cm\advisors\ackmed\ackmedad_warp-01.wav \ No newline at end of file diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_addon-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_addon-01.wav new file mode 100644 index 00000000..1dbeb665 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_addon-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_addon-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_addon-02.wav new file mode 100644 index 00000000..d32126a0 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_addon-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-01.wav new file mode 100644 index 00000000..20d5d211 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-02.wav new file mode 100644 index 00000000..50e0b017 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-03.wav new file mode 100644 index 00000000..7d4a3593 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-p-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-01.wav new file mode 100644 index 00000000..8db9ba8a Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-02.wav new file mode 100644 index 00000000..8dedb141 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-03.wav new file mode 100644 index 00000000..e0bf59eb Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-t-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-01.wav new file mode 100644 index 00000000..87e39160 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-02.wav new file mode 100644 index 00000000..a0a3b176 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-03.wav new file mode 100644 index 00000000..7704a8a5 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_allyattack-z-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-01.wav new file mode 100644 index 00000000..a42e04f0 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-02.wav new file mode 100644 index 00000000..f5dcce51 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-03.wav new file mode 100644 index 00000000..6e8489d6 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-04.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-04.wav new file mode 100644 index 00000000..6efe8e18 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_armyattack-04.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-01.wav new file mode 100644 index 00000000..9e5d5cc0 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-02.wav new file mode 100644 index 00000000..23cbc9b9 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-03.wav new file mode 100644 index 00000000..f286902d Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-04.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-04.wav new file mode 100644 index 00000000..71b3d100 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_baseattack-04.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_energy-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-01.wav new file mode 100644 index 00000000..d571f879 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_energy-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-02.wav new file mode 100644 index 00000000..a2c79a8e Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_energy-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-03.wav new file mode 100644 index 00000000..3a9e5d79 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_energy-04.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-04.wav new file mode 100644 index 00000000..2f03616e Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_energy-04.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_intland-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_intland-01.wav new file mode 100644 index 00000000..a2e64c77 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_intland-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_intland-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_intland-02.wav new file mode 100644 index 00000000..2bb77230 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_intland-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-01.wav new file mode 100644 index 00000000..e874f48e Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-02.wav new file mode 100644 index 00000000..650c8465 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-03.wav new file mode 100644 index 00000000..6e0de9c4 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-04.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-04.wav new file mode 100644 index 00000000..5772d585 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_minerals-04.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_missile-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_missile-01.wav new file mode 100644 index 00000000..7aca0bfb Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_missile-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_missile-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_missile-02.wav new file mode 100644 index 00000000..582683d5 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_missile-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_missilelaunch-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_missilelaunch-01.wav new file mode 100644 index 00000000..75bcfdd8 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_missilelaunch-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_missilelaunch-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_missilelaunch-02.wav new file mode 100644 index 00000000..5df5594e Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_missilelaunch-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_nobuild-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_nobuild-01.wav new file mode 100644 index 00000000..2800ec6a Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_nobuild-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_nobuild-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_nobuild-02.wav new file mode 100644 index 00000000..86106ab1 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_nobuild-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_noland-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_noland-01.wav new file mode 100644 index 00000000..7de5f89b Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_noland-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_noland-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_noland-02.wav new file mode 100644 index 00000000..c53d82f4 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_noland-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_nowarp-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_nowarp-01.wav new file mode 100644 index 00000000..4c9adbc4 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_nowarp-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_nowarp-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_nowarp-02.wav new file mode 100644 index 00000000..e266bed6 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_nowarp-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_tech-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_tech-01.wav new file mode 100644 index 00000000..f3b792e7 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_tech-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_tech-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_tech-02.wav new file mode 100644 index 00000000..4a2bea03 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_tech-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-01.wav new file mode 100644 index 00000000..ccf8e561 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-02.wav new file mode 100644 index 00000000..c6bd94b8 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-02.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-03.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-03.wav new file mode 100644 index 00000000..e4887e84 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-03.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-04.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-04.wav new file mode 100644 index 00000000..c5c4f98a Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_vespene-04.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_warp-01.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_warp-01.wav new file mode 100644 index 00000000..2f8fc7c0 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_warp-01.wav differ diff --git a/mpq/sound/cm/advisors/ackmed/ackmedad_warp-02.wav b/mpq/sound/cm/advisors/ackmed/ackmedad_warp-02.wav new file mode 100644 index 00000000..fda249d0 Binary files /dev/null and b/mpq/sound/cm/advisors/ackmed/ackmedad_warp-02.wav differ diff --git a/patchnotes.md b/patchnotes.md index 10daa237..4d00c5eb 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -31,6 +31,7 @@ Forthcoming. ## UI - Starting resources now display instantly, instead of counting up from zero or from previous match total (c. DF) +- The Ackmed custom advisor, commissioned by 3crow, is now available! - Added a minimum delay for custom advisor lines - Implemented custom advisor handling for the following events: - Protoss structure completion diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 2270c88a..51469896 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ