diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index 1f019265..7c1ae07f 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index ce928e5e..eb39cf58 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 67c5f142..e3e81af2 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2440,32 +2440,32 @@ Striga Under Attack 01 Striga Under Attack 02 Striga Under Attack 03 Striga 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 -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 +Southpaw Weaponfire 01 +Southpaw Weaponfire 02 +Southpaw Ready 01 +Southpaw What 01 +Southpaw What 02 +Southpaw What 03 +Southpaw What 04 +Southpaw Order Passive 01 +Southpaw Order Passive 02 +Southpaw Order Passive 03 +Southpaw Order Passive 04 +Wendigo Weaponfire 01 +Wendigo Weaponfire 02 +Wendigo Death 01 +Wendigo Death 02 +Wendigo Death 03 +Wendigo Death 04 +Wendigo Ready 01 +Wendigo What 01 +Wendigo What 02 +Wendigo What 03 +Wendigo What 04 +Wendigo Order Passive 01 +Wendigo Order Passive 02 +Wendigo Order Passive 03 +Wendigo Order Passive 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 5e4ae331..d86bcdef 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1245,8 +1245,8 @@ cm\p\pariah\dth-02.wav cm\p\pariah\dth-03.wav cm\p\pariah\dth-04.wav cm\p\starsovereign\ch-01.wav -cm\t\southpaw\dth-01.wav -cm\t\southpaw\dth-02.wav +cm\f\southpaw\dth-01.wav +cm\f\southpaw\dth-02.wav cm\t\gorgon\dth-01.wav cm\t\gorgon\dth-02.wav cm\t\gorgon\dth-03.wav @@ -1615,23 +1615,23 @@ cm\t\striga\yes-03.wav cm\t\striga\yes-04.wav cm\t\striga\wf-01.wav cm\t\striga\wf-02.wav -cm\f\axitrilisk\rdy-01.wav -cm\f\axitrilisk\wht-01.wav -cm\f\axitrilisk\wht-02.wav -cm\f\axitrilisk\wht-03.wav -cm\f\axitrilisk\wht-04.wav -cm\f\axitrilisk\yes-01.wav -cm\f\axitrilisk\yes-02.wav -cm\f\axitrilisk\yes-03.wav -cm\f\axitrilisk\yes-04.wav -cm\f\axitrilisk\wf-01.wav -cm\f\axitrilisk\wf-02.wav -cm\f\axitrilisk\wf-03.wav -cm\f\axitrilisk\wf-04.wav -cm\f\axitrilisk\wf-05.wav -cm\f\axitrilisk\sl-01.wav -cm\f\axitrilisk\sl-02.wav -cm\f\axitrilisk\sl-03.wav +cm\z\axitrilisk\rdy-01.wav +cm\z\axitrilisk\wht-01.wav +cm\z\axitrilisk\wht-02.wav +cm\z\axitrilisk\wht-03.wav +cm\z\axitrilisk\wht-04.wav +cm\z\axitrilisk\yes-01.wav +cm\z\axitrilisk\yes-02.wav +cm\z\axitrilisk\yes-03.wav +cm\z\axitrilisk\yes-04.wav +cm\z\axitrilisk\wf-01.wav +cm\z\axitrilisk\wf-02.wav +cm\z\axitrilisk\wf-03.wav +cm\z\axitrilisk\wf-04.wav +cm\z\axitrilisk\wf-05.wav +cm\z\axitrilisk\sl-01.wav +cm\z\axitrilisk\sl-02.wav +cm\z\axitrilisk\sl-03.wav cm\t\anticthon\wf-01.wav cm\t\anticthon\wf-02.wav cm\t\anticthon\wf-03.wav @@ -2439,4 +2439,30 @@ cm\t\striga\agg-04.wav cm\t\striga\hlp-01.wav cm\t\striga\hlp-02.wav cm\t\striga\hlp-03.wav -cm\t\striga\hlp-04.wav \ No newline at end of file +cm\t\striga\hlp-04.wav +cm\f\southpaw\wf-01.wav +cm\f\southpaw\wf-02.wav +cm\f\southpaw\rdy-01.wav +cm\f\southpaw\wht-01.wav +cm\f\southpaw\wht-02.wav +cm\f\southpaw\wht-03.wav +cm\f\southpaw\wht-04.wav +cm\f\southpaw\yes-01.wav +cm\f\southpaw\yes-02.wav +cm\f\southpaw\yes-03.wav +cm\f\southpaw\yes-04.wav +cm\f\wendigo\wf-01.wav +cm\f\wendigo\wf-02.wav +cm\f\wendigo\dth-01.wav +cm\f\wendigo\dth-02.wav +cm\f\wendigo\dth-03.wav +cm\f\wendigo\dth-04.wav +cm\f\wendigo\rdy-01.wav +cm\f\wendigo\wht-01.wav +cm\f\wendigo\wht-02.wav +cm\f\wendigo\wht-03.wav +cm\f\wendigo\wht-04.wav +cm\f\wendigo\yes-01.wav +cm\f\wendigo\yes-02.wav +cm\f\wendigo\yes-03.wav +cm\f\wendigo\yes-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index b461bf1a..91f3486e 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index acd571db..123e4b16 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 a0150c6e..f250d685 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index f8f02f6e..6c575da8 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 3dca61c2..6e45defd 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 1ab2106d..ce5ba63a 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -28835,7 +28835,7 @@ SalamanderDeath: end SalamanderGndAttkInit: - wait 2 + wait 1 nobrkcodestart playsndbtwn 683 685 # Salamander weaponfire 01, 02, 03 attackwith 1 @@ -28843,8 +28843,7 @@ SalamanderGndAttkInit: attackwith 1 wait 3 attackwith 1 - wait 3 - wait 1 + wait 1 nobrkcodeend gotorepeatattk ignorerest @@ -31211,7 +31210,7 @@ TalosGndAttkRpt: playfram 0x20 wait 1 playfram 0x40 - playsndbtwn 2012 2013 # Talos attack 01, 02 + playsndbtwn 2012 2013 # Talos weaponfire 01, 02 attackwith 1 wait 1 playfram 0x20 @@ -48301,7 +48300,7 @@ WendigoGndAttkInit: wait 1 nobrkcodestart playfram 0x40 - playsndbtwn 2012 2013 # Talos attack 01, 02 + playsndbtwn 2453 2454 # Wendigo weaponfire 01, 02 attackwith 1 wait 1 playfram 0x60 @@ -48371,8 +48370,17 @@ SouthpawDeath: SouthpawGndAttkInit: wait 1 - attackwith 1 - playsnd 74 # Bullet\TPhFi100.wav + nobrkcodestart + playsndbtwn 2442 2443 # Southpaw weaponfire 01, 02 + attackwith 1 + wait 2 + playsndbtwn 2442 2443 # Southpaw weaponfire + attackwith 1 + wait 2 + playsndbtwn 2442 2443 # Southpaw weaponfire + attackwith 1 + wait 1 + nobrkcodeend gotorepeatattk goto SouthpawLocal00 diff --git a/mpq/sound/cm/t/southpaw/dth-01.wav b/mpq/sound/cm/f/southpaw/dth-01.wav similarity index 100% rename from mpq/sound/cm/t/southpaw/dth-01.wav rename to mpq/sound/cm/f/southpaw/dth-01.wav diff --git a/mpq/sound/cm/t/southpaw/dth-02.wav b/mpq/sound/cm/f/southpaw/dth-02.wav similarity index 100% rename from mpq/sound/cm/t/southpaw/dth-02.wav rename to mpq/sound/cm/f/southpaw/dth-02.wav diff --git a/mpq/sound/cm/f/southpaw/rdy-01.wav b/mpq/sound/cm/f/southpaw/rdy-01.wav new file mode 100644 index 00000000..338e9a98 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/rdy-01.wav differ diff --git a/mpq/sound/cm/f/southpaw/wf-01.wav b/mpq/sound/cm/f/southpaw/wf-01.wav new file mode 100644 index 00000000..1346aa1b Binary files /dev/null and b/mpq/sound/cm/f/southpaw/wf-01.wav differ diff --git a/mpq/sound/cm/f/southpaw/wf-02.wav b/mpq/sound/cm/f/southpaw/wf-02.wav new file mode 100644 index 00000000..0c1c5139 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/wf-02.wav differ diff --git a/mpq/sound/cm/f/southpaw/wht-01.wav b/mpq/sound/cm/f/southpaw/wht-01.wav new file mode 100644 index 00000000..985210f3 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/wht-01.wav differ diff --git a/mpq/sound/cm/f/southpaw/wht-02.wav b/mpq/sound/cm/f/southpaw/wht-02.wav new file mode 100644 index 00000000..f68ae43d Binary files /dev/null and b/mpq/sound/cm/f/southpaw/wht-02.wav differ diff --git a/mpq/sound/cm/f/southpaw/wht-03.wav b/mpq/sound/cm/f/southpaw/wht-03.wav new file mode 100644 index 00000000..d2a74289 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/wht-03.wav differ diff --git a/mpq/sound/cm/f/southpaw/wht-04.wav b/mpq/sound/cm/f/southpaw/wht-04.wav new file mode 100644 index 00000000..2e13bae9 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/wht-04.wav differ diff --git a/mpq/sound/cm/f/southpaw/yes-01.wav b/mpq/sound/cm/f/southpaw/yes-01.wav new file mode 100644 index 00000000..f78e2ebd Binary files /dev/null and b/mpq/sound/cm/f/southpaw/yes-01.wav differ diff --git a/mpq/sound/cm/f/southpaw/yes-02.wav b/mpq/sound/cm/f/southpaw/yes-02.wav new file mode 100644 index 00000000..cb950d64 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/yes-02.wav differ diff --git a/mpq/sound/cm/f/southpaw/yes-03.wav b/mpq/sound/cm/f/southpaw/yes-03.wav new file mode 100644 index 00000000..fb20b93c Binary files /dev/null and b/mpq/sound/cm/f/southpaw/yes-03.wav differ diff --git a/mpq/sound/cm/f/southpaw/yes-04.wav b/mpq/sound/cm/f/southpaw/yes-04.wav new file mode 100644 index 00000000..b988f4c7 Binary files /dev/null and b/mpq/sound/cm/f/southpaw/yes-04.wav differ diff --git a/mpq/sound/cm/t/wendigo/wendigo-dth-01.wav b/mpq/sound/cm/f/wendigo/dth-01.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-dth-01.wav rename to mpq/sound/cm/f/wendigo/dth-01.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-dth-02.wav b/mpq/sound/cm/f/wendigo/dth-02.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-dth-02.wav rename to mpq/sound/cm/f/wendigo/dth-02.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-dth-03.wav b/mpq/sound/cm/f/wendigo/dth-03.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-dth-03.wav rename to mpq/sound/cm/f/wendigo/dth-03.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-dth-04.wav b/mpq/sound/cm/f/wendigo/dth-04.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-dth-04.wav rename to mpq/sound/cm/f/wendigo/dth-04.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-ready-01.wav b/mpq/sound/cm/f/wendigo/rdy-01.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-ready-01.wav rename to mpq/sound/cm/f/wendigo/rdy-01.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-weaponfire-01.wav b/mpq/sound/cm/f/wendigo/wf-01.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-weaponfire-01.wav rename to mpq/sound/cm/f/wendigo/wf-01.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-weaponfire-02.wav b/mpq/sound/cm/f/wendigo/wf-02.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-weaponfire-02.wav rename to mpq/sound/cm/f/wendigo/wf-02.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-what-01.wav b/mpq/sound/cm/f/wendigo/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-what-01.wav rename to mpq/sound/cm/f/wendigo/wht-01.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-what-02.wav b/mpq/sound/cm/f/wendigo/wht-02.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-what-02.wav rename to mpq/sound/cm/f/wendigo/wht-02.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-what-03.wav b/mpq/sound/cm/f/wendigo/wht-03.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-what-03.wav rename to mpq/sound/cm/f/wendigo/wht-03.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-what-04.wav b/mpq/sound/cm/f/wendigo/wht-04.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-what-04.wav rename to mpq/sound/cm/f/wendigo/wht-04.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-yes-01.wav b/mpq/sound/cm/f/wendigo/yes-01.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-yes-01.wav rename to mpq/sound/cm/f/wendigo/yes-01.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-yes-02.wav b/mpq/sound/cm/f/wendigo/yes-02.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-yes-02.wav rename to mpq/sound/cm/f/wendigo/yes-02.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-yes-03.wav b/mpq/sound/cm/f/wendigo/yes-03.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-yes-03.wav rename to mpq/sound/cm/f/wendigo/yes-03.wav diff --git a/mpq/sound/cm/t/wendigo/wendigo-yes-04.wav b/mpq/sound/cm/f/wendigo/yes-04.wav similarity index 100% rename from mpq/sound/cm/t/wendigo/wendigo-yes-04.wav rename to mpq/sound/cm/f/wendigo/yes-04.wav diff --git a/mpq/sound/cm/f/axitrilisk/rdy-01.wav b/mpq/sound/cm/z/axitrilisk/rdy-01.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/rdy-01.wav rename to mpq/sound/cm/z/axitrilisk/rdy-01.wav diff --git a/mpq/sound/cm/f/axitrilisk/sl-01.wav b/mpq/sound/cm/z/axitrilisk/sl-01.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/sl-01.wav rename to mpq/sound/cm/z/axitrilisk/sl-01.wav diff --git a/mpq/sound/cm/f/axitrilisk/sl-02.wav b/mpq/sound/cm/z/axitrilisk/sl-02.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/sl-02.wav rename to mpq/sound/cm/z/axitrilisk/sl-02.wav diff --git a/mpq/sound/cm/f/axitrilisk/sl-03.wav b/mpq/sound/cm/z/axitrilisk/sl-03.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/sl-03.wav rename to mpq/sound/cm/z/axitrilisk/sl-03.wav diff --git a/mpq/sound/cm/f/axitrilisk/wf-01.wav b/mpq/sound/cm/z/axitrilisk/wf-01.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wf-01.wav rename to mpq/sound/cm/z/axitrilisk/wf-01.wav diff --git a/mpq/sound/cm/f/axitrilisk/wf-02.wav b/mpq/sound/cm/z/axitrilisk/wf-02.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wf-02.wav rename to mpq/sound/cm/z/axitrilisk/wf-02.wav diff --git a/mpq/sound/cm/f/axitrilisk/wf-03.wav b/mpq/sound/cm/z/axitrilisk/wf-03.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wf-03.wav rename to mpq/sound/cm/z/axitrilisk/wf-03.wav diff --git a/mpq/sound/cm/f/axitrilisk/wf-04.wav b/mpq/sound/cm/z/axitrilisk/wf-04.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wf-04.wav rename to mpq/sound/cm/z/axitrilisk/wf-04.wav diff --git a/mpq/sound/cm/f/axitrilisk/wf-05.wav b/mpq/sound/cm/z/axitrilisk/wf-05.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wf-05.wav rename to mpq/sound/cm/z/axitrilisk/wf-05.wav diff --git a/mpq/sound/cm/f/axitrilisk/wht-01.wav b/mpq/sound/cm/z/axitrilisk/wht-01.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wht-01.wav rename to mpq/sound/cm/z/axitrilisk/wht-01.wav diff --git a/mpq/sound/cm/f/axitrilisk/wht-02.wav b/mpq/sound/cm/z/axitrilisk/wht-02.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wht-02.wav rename to mpq/sound/cm/z/axitrilisk/wht-02.wav diff --git a/mpq/sound/cm/f/axitrilisk/wht-03.wav b/mpq/sound/cm/z/axitrilisk/wht-03.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wht-03.wav rename to mpq/sound/cm/z/axitrilisk/wht-03.wav diff --git a/mpq/sound/cm/f/axitrilisk/wht-04.wav b/mpq/sound/cm/z/axitrilisk/wht-04.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/wht-04.wav rename to mpq/sound/cm/z/axitrilisk/wht-04.wav diff --git a/mpq/sound/cm/f/axitrilisk/yes-01.wav b/mpq/sound/cm/z/axitrilisk/yes-01.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/yes-01.wav rename to mpq/sound/cm/z/axitrilisk/yes-01.wav diff --git a/mpq/sound/cm/f/axitrilisk/yes-02.wav b/mpq/sound/cm/z/axitrilisk/yes-02.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/yes-02.wav rename to mpq/sound/cm/z/axitrilisk/yes-02.wav diff --git a/mpq/sound/cm/f/axitrilisk/yes-03.wav b/mpq/sound/cm/z/axitrilisk/yes-03.wav similarity index 100% rename from mpq/sound/cm/f/axitrilisk/yes-03.wav rename to mpq/sound/cm/z/axitrilisk/yes-03.wav diff --git a/mpq/unit/cm/terran/southpaw-engine.grp b/mpq/unit/cm/faction/southpaw-engine.grp similarity index 100% rename from mpq/unit/cm/terran/southpaw-engine.grp rename to mpq/unit/cm/faction/southpaw-engine.grp diff --git a/mpq/unit/cm/terran/southpaw.grp b/mpq/unit/cm/faction/southpaw.grp similarity index 100% rename from mpq/unit/cm/terran/southpaw.grp rename to mpq/unit/cm/faction/southpaw.grp diff --git a/mpq/unit/cm/terran/wendigo.grp b/mpq/unit/cm/faction/wendigo.grp similarity index 100% rename from mpq/unit/cm/terran/wendigo.grp rename to mpq/unit/cm/faction/wendigo.grp diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 3753c864..f5b63e59 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 06b13633..090180d7 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a7f42beb..3fa91545 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ