diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 10223ff9..254cb309 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 3d5d221f..a88cc36e 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -26338,11 +26338,25 @@ NathrokorGndAttkInit: goto NathrokorGndAttkToIdle NathrokorAirAttkInit: - playsndbtwn 1326 1328 # Nathrokor attack 01, 02, 03 - attackwith 2 - attackwith 2 - wait 2 - gotorepeatattk + playfram 0x180 + wait 1 + nobrkcodestart + playfram 0x1A0 + wait 1 + playfram 0x1C0 + attackmelee 1 894 # Zerg\Ultra\zulHit00.WAV + wait 1 + playfram 0x1E0 + wait 1 + playfram 0x200 + attackmelee 1 894 # Zerg\Ultra\zulHit00.WAV + wait 1 + playfram 0x220 + wait 1 + playfram 0x240 + wait 1 + nobrkcodeend + gotorepeatattk goto NathrokorGndAttkToIdle NathrokorWalking: @@ -39235,15 +39249,15 @@ LiiraliskWalkingToIdle: playfram 0x00 wait 2 LiiraliskLocal00: - playfram 0x11 + playfram 0x20 wait 2 - playfram 0x22 + playfram 0x40 wait 2 - playfram 0x33 + playfram 0x60 wait 2 - playfram 0x44 + playfram 0x80 wait 2 - playfram 0x55 + playfram 0xA0 wait 2 playfram 0x00 wait 2 @@ -39283,101 +39297,101 @@ LiiraliskUnused1: LiiraliskGndAttkInit: playfram 0x00 wait 1 - playfram 0xee + playfram 0x1C0 wait 2 LiiraliskGndAttkRpt: wait 1 nobrkcodestart playsndbtwn 2014 2015 # Liiralisk attack 01, 02 - playfram 0xff + playfram 0x1E0 wait 1 - playfram 0x110 + playfram 0x200 attack attack wait 1 - playfram 0x121 + playfram 0x220 wait 1 - playfram 0x132 + playfram 0x240 wait 1 - playfram 0x143 + playfram 0x260 wait 1 nobrkcodeend gotorepeatattk ignorerest LiiraliskGndAttkToIdle: - playfram 0xff + playfram 0x1E0 wait 1 - playfram 0xee + playfram 0x1C0 wait 1 playfram 0x00 wait 1 goto LiiraliskWalkingToIdle LiiraliskWalking: - move 6 - wait 1 - playfram 0x66 + move 6 + wait 1 + playfram 0xC0 + move 6 + wait 1 + playfram 0xE0 + move 6 + wait 1 + playfram 0x100 move 6 wait 1 - playfram 0x77 - move 6 - wait 1 - playfram 0x88 - move 6 - wait 1 - playfram 0x99 - move 6 - wait 1 - playfram 0xaa - move 6 - wait 1 - playfram 0xbb + playfram 0x120 move 6 - wait 1 - playfram 0xcc - move 6 - wait 1 - playfram 0xdd + wait 1 + playfram 0x140 + move 6 + wait 1 + playfram 0x160 + move 6 + wait 1 + playfram 0x180 + move 6 + wait 1 + playfram 0x1A0 goto LiiraliskWalking LiiraliskSpecialState2: - playfram 0x1a9 + playfram 0x320 goto LiiraliskLocal07 LiiraliskLocal07: - wait 125 + wait 125 goto LiiraliskLocal07 LiiraliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) playfram 0x00 wait 1 - playfram 0x154 + playfram 0x280 wait 1 - playfram 0x165 + playfram 0x2A0 wait 1 - playfram 0x176 + playfram 0x2C0 wait 1 - playfram 0x187 + playfram 0x2E0 wait 1 - playfram 0x198 + playfram 0x300 sigorder 4 - playfram 0x1a9 + playfram 0x320 goto LiiraliskLocal07 LiiraliskUnBurrow: wait 1 waitrand 1 4 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0x198 + playfram 0x300 wait 1 - playfram 0x187 + playfram 0x2E0 wait 1 - playfram 0x176 + playfram 0x2C0 wait 1 - playfram 0x165 + playfram 0x2A0 wait 1 - playfram 0x154 + playfram 0x280 wait 1 sigorder 4 goto LiiraliskWalkingToIdle diff --git a/mpq/unit/cm/zerg/nathrokor.grp b/mpq/unit/cm/zerg/nathrokor.grp index 13dd4acd..69abc7f8 100644 Binary files a/mpq/unit/cm/zerg/nathrokor.grp and b/mpq/unit/cm/zerg/nathrokor.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 27f6560b..12a0d9b3 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ