diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 206dbc5c..831b5550 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 0ca4bc1c..77eb6cba 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 0cc245fc..c1672048 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2105,7 +2105,7 @@ Madrigal (Hecaton, Imperioso) Shadow Madrigal Turret (Hecaton, Imperioso) Madrigal (Hecaton, Furia) Madrigal Turret (Hecaton, Furia) -Extended Image #1105 +Zoryusthaleth Mutate Extended Image #1106 Extended Image #1107 Extended Image #1108 diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 1419cd10..fc5dc183 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 5e21bb35..7be28e7b 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -9174,20 +9174,20 @@ ZoryusthalethGndAttkInit: wait 1 nobrkcodestart playsndbtwn 1918 1919 # Zoryusthaleth weaponfire 01, 02 - playfram 0xaa + playfram 0xAA wait 1 - playfram 0xbb + playfram 0xBB wait 1 - playfram 0xcc + playfram 0xCC wait 1 - playfram 0xdd + playfram 0xDD attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 1 - playfram 0xcc + playfram 0xEE wait 1 - playfram 0xbb + playfram 0xFF wait 1 - playfram 0xaa + playfram 0x110 nobrkcodeend gotorepeatattk goto ZoryusthalethGndAttkToIdle @@ -9211,25 +9211,31 @@ ZoryusthalethCastSpell: ZoryusthalethWalking: move 5 - wait 1 + wait 1 + playfram 0x11 + move 5 + wait 1 + playfram 0x22 + move 5 + wait 1 playfram 0x33 - move 5 - wait 1 - playfram 0x44 - move 5 - wait 1 - playfram 0x55 move 5 - wait 1 + wait 1 + playfram 0x44 + move 5 + wait 1 + playfram 0x55 + move 5 + wait 1 playfram 0x66 move 5 - wait 1 + wait 1 playfram 0x77 - move 5 - wait 1 + move 5 + wait 1 playfram 0x88 move 5 - wait 1 + wait 1 playfram 0x99 goto ZoryusthalethWalking @@ -9240,23 +9246,23 @@ ZoryusthalethSpecialState2: ZoryusthalethBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) - playfram 0xee - wait 1 - playfram 0xff - wait 1 - playfram 0x110 - wait 1 playfram 0x121 wait 1 playfram 0x132 - imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) - imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) - imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) wait 1 playfram 0x143 wait 1 playfram 0x154 wait 1 + playfram 0x165 + imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x176 + wait 1 + playfram 0x187 + wait 1 sigorder 4 goto SkryrokorLocal00 @@ -9265,20 +9271,20 @@ ZoryusthalethUnBurrow: waitrand 1 2 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x176 + wait 1 + playfram 0x165 + wait 1 + playfram 0x154 + wait 1 playfram 0x143 + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) wait 1 playfram 0x132 wait 1 playfram 0x121 wait 1 - playfram 0x110 - imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) - imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) - wait 1 - playfram 0xff - wait 1 - playfram 0xee - wait 1 sigorder 4 goto ZoryusthalethGndAttkToIdle diff --git a/mpq/unit/cm/zerg/zoryusthaleth-birth.grp b/mpq/unit/cm/zerg/zoryusthaleth-birth.grp index aef9da65..d6493855 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth-birth.grp and b/mpq/unit/cm/zerg/zoryusthaleth-birth.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp b/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp new file mode 100644 index 00000000..bb7e1d55 Binary files /dev/null and b/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp index bcd28781..629515c2 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp and b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth.grp b/mpq/unit/cm/zerg/zoryusthaleth.grp index 419cf732..493642a4 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth.grp and b/mpq/unit/cm/zerg/zoryusthaleth.grp differ diff --git a/patchnotes.md b/patchnotes.md index f0fc7aac..d00d39dd 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -39,6 +39,7 @@ - New models for: - **Matador** (c. Solstice) - **Artisan** (c. DeltaCadimus) + - **Zoryusthaleth** (c. DeltaCadimus & Solstice) - Modified models for: - **Madrigal** (material updates) - **Legionnaire** and **Izirokor** (slight size increases, c. Solstice) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index b6eecf16..a18d2db1 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ