diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3e3f6344..ae52e74b 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 db38bb24..8fd09871 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 baf41dcf..d4cc12c4 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1852,7 +1852,7 @@ Sevenstep Mind Matter Overlay Grand Library Grand Library Shadow Grand Library Warp Flash -Extended Image #852 +Gladius Charge Extended Image #853 Extended Image #854 Extended Image #855 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index f680a41d..2156a242 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 8c49163b..12d70360 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3098,9 +3098,9 @@ Ataltreth Advisor No Warp 01 Ataltreth Advisor Tech Up 01 Ataltreth Advisor No Vespene 01 Ataltreth Advisor Warp Complete 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Gladius Passive Fire 01 +Gladius Passive Fire 02 +Gladius Passive Fire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 26865178..91575189 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3097,4 +3097,7 @@ cm\advisors\ataltreth\ataltrethad_noland-01.wav cm\advisors\ataltreth\ataltrethad_nowarp-01.wav cm\advisors\ataltreth\ataltrethad_tech-01.wav cm\advisors\ataltreth\ataltrethad_vespene-01.wav -cm\advisors\ataltreth\ataltrethad_warp-01.wav \ No newline at end of file +cm\advisors\ataltreth\ataltrethad_warp-01.wav +cm\p\gladius\pas-01.wav +cm\p\gladius\pas-02.wav +cm\p\gladius\pas-03.wav \ No newline at end of file diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 98b4192c..1d93ca17 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -51078,4 +51078,44 @@ GrandLibraryEnable: wait 1 goto ScourgeLocal00 -## Next free IsId: 779 \ No newline at end of file + + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1854 Gladius Charge (cm\protoss\gladius-charge.grp) +.headerstart +IsId 779 +Type 1 +Init GladiusChargeInit +Death GladiusChargeDeath +.headerend +# ----------------------------------------------------------------------------- # + +GladiusChargeInit: + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + goto GladiusChargeInit +GladiusChargeDeath: + playfram 0 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + end + +## Next free IsId: 780 \ No newline at end of file diff --git a/mpq/sound/cm/p/gladius/pas-01.wav b/mpq/sound/cm/p/gladius/pas-01.wav new file mode 100644 index 00000000..42f1a95c Binary files /dev/null and b/mpq/sound/cm/p/gladius/pas-01.wav differ diff --git a/mpq/sound/cm/p/gladius/pas-02.wav b/mpq/sound/cm/p/gladius/pas-02.wav new file mode 100644 index 00000000..e7426a3c Binary files /dev/null and b/mpq/sound/cm/p/gladius/pas-02.wav differ diff --git a/mpq/sound/cm/p/gladius/pas-03.wav b/mpq/sound/cm/p/gladius/pas-03.wav new file mode 100644 index 00000000..84da76de Binary files /dev/null and b/mpq/sound/cm/p/gladius/pas-03.wav differ diff --git a/mpq/unit/cm/protoss/gladius-charge.grp b/mpq/unit/cm/protoss/gladius-charge.grp new file mode 100644 index 00000000..c1227817 Binary files /dev/null and b/mpq/unit/cm/protoss/gladius-charge.grp differ diff --git a/patchnotes.md b/patchnotes.md index 42a9d219..55356932 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -36,6 +36,7 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues - Maverick Stimpack (inject, proc, expire) - Savant form switch - Madcap Cabeirus Feeders achieving full stacks + - Gladius Binding Plasma charge (visuals) and proc (audio) - Advisors: - Replaced default Zerg advisor - Achieved custom advisor support for: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 2299682e..1e226f48 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ