diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 84bc04f2..27b72c1f 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index c96f74fd..80cedda7 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 0742c9fc..9937cf8a 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 49ff5108..0b811a50 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -14665,11 +14665,7 @@ VorvrokorWalking: VorvrokorSpecialState2: playfram 0x110 - goto VorvrokorLocal04 - -VorvrokorLocal04: - wait 125 - goto VorvrokorLocal04 + goto ZoryusthalethLocal07 VorvrokorBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -14684,7 +14680,7 @@ VorvrokorBurrow: playfram 0x110 wait 1 sigorder 4 - goto VorvrokorLocal04 + goto ZoryusthalethLocal07 VorvrokorUnBurrow: wait 1 @@ -26962,7 +26958,7 @@ AlkajeliskWalking: # 1113 Keskathalor (zerg\keskathalor.grp) .headerstart IsId 461 -Type 12 +Type 26 Init KeskathalorInit Death KeskathalorDeath GndAttkInit KeskathalorGndAttkInit @@ -26977,6 +26973,20 @@ Unused2 [NONE] Walking KeskathalorWalking WalkingToIdle KeskathalorGndAttkToIdle SpecialState1 [NONE] +SpecialState2 KeskathalorSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow KeskathalorBurrow +UnBurrow KeskathalorUnBurrow +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -27116,6 +27126,50 @@ KeskathalorWalking: playfram 0x77 goto KeskathalorWalking +KeskathalorSpecialState2: + playfram 0x165 + goto ZoryusthalethLocal07 + +KeskathalorBurrow: + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + playfram 0x165 + wait 1 + sigorder 4 + goto ZoryusthalethLocal07 + +KeskathalorUnBurrow: + wait 1 + waitrand 1 2 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x66 + wait 1 + playfram 0x55 + wait 1 + playfram 0x44 + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + wait 1 + playfram 0x11 + wait 1 + sigorder 4 + goto KeskathalorGndAttkToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1115 Star Sovereign (cm\protoss\starsovereign.grp) @@ -34687,23 +34741,23 @@ ZoryusthalethBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) playfram 0xee - wait 1 + wait 1 playfram 0xff - wait 1 + wait 1 playfram 0x110 - wait 1 + wait 1 playfram 0x121 - wait 1 + 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 + wait 1 playfram 0x143 - wait 1 + wait 1 playfram 0x154 - wait 1 - sigorder 4 + wait 1 + sigorder 4 goto ZoryusthalethLocal07 ZoryusthalethUnBurrow: @@ -34712,20 +34766,20 @@ ZoryusthalethUnBurrow: imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) playfram 0x143 - wait 1 + wait 1 playfram 0x132 - wait 1 + wait 1 playfram 0x121 - wait 1 + wait 1 playfram 0x110 imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) - wait 1 + wait 1 playfram 0xff - wait 1 + wait 1 playfram 0xee - wait 1 - sigorder 4 + wait 1 + sigorder 4 goto ZoryusthalethGndAttkToIdle # ----------------------------------------------------------------------------- # @@ -40283,49 +40337,45 @@ AxitriliskWalking: goto AxitriliskWalking AxitriliskSpecialState2: -# playfram 0x1a9 - goto AxitriliskLocal04 - -AxitriliskLocal04: - wait 125 - goto AxitriliskLocal04 + playfram 0x200 + goto ZoryusthalethLocal07 AxitriliskBurrow: setfldirect 14 imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) -# playfram 0x143 + playfram 0x20 wait 1 -# playfram 0x154 + playfram 0x40 wait 1 -# playfram 0x165 + playfram 0x60 wait 1 -# playfram 0x176 + playfram 0x80 wait 1 -# playfram 0x187 + playfram 0xA0 wait 1 -# playfram 0x198 + playfram 0xC0 wait 1 -# playfram 0x1a9 + playfram 0x200 wait 1 sigorder 4 - goto AxitriliskLocal04 + goto ZoryusthalethLocal07 AxitriliskUnBurrow: wait 1 waitrand 1 2 setfldirect 14 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) -# playfram 0x198 + playfram 0xC0 wait 1 -# playfram 0x187 + playfram 0xA0 wait 1 -# playfram 0x176 + playfram 0x80 wait 1 -# playfram 0x165 + playfram 0x60 wait 1 -# playfram 0x154 + playfram 0x40 wait 1 -# playfram 0x143 + playfram 0x20 wait 1 sigorder 4 goto AxitriliskWalkingToIdle @@ -44250,43 +44300,35 @@ EvigriliskWalking: goto EvigriliskWalking EvigriliskSpecialState2: - playfram 0xcc - goto EvigriliskLocal04 - -EvigriliskLocal04: - wait 125 - goto EvigriliskLocal04 + playfram 0x176 + goto ZoryusthalethLocal07 EvigriliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0x77 + playfram 0xdd wait 1 - playfram 0x88 + playfram 0xee wait 1 - playfram 0x99 + playfram 0xff wait 1 - playfram 0xaa + playfram 0x110 wait 1 - playfram 0xbb - wait 1 - playfram 0xcc + playfram 0x176 sigorder 4 wait 1 - goto EvigriliskLocal04 + goto ZoryusthalethLocal07 EvigriliskUnBurrow: wait 1 waitrand 1 2 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0xbb + playfram 0x110 wait 1 - playfram 0xaa + playfram 0xff wait 1 - playfram 0x99 + playfram 0xee wait 1 - playfram 0x88 - wait 1 - playfram 0x77 + playfram 0xdd wait 1 sigorder 4 goto EvigriliskWalkingToIdle @@ -46318,7 +46360,7 @@ EpigraphWarpIn: # 1309 Tethzorokor (cm\zerg\tethzorokor.grp) .headerstart IsId 692 -Type 21 +Type 26 Init TethzorokorInit Death TethzorokorDeath GndAttkInit TethzorokorGndAttkInit @@ -46333,7 +46375,7 @@ Unused2 [NONE] Walking TethzorokorWalking WalkingToIdle TethzorokorWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] +SpecialState2 TethzorokorSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -46341,6 +46383,11 @@ LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow TethzorokorBurrow +UnBurrow TethzorokorUnBurrow .headerend # ----------------------------------------------------------------------------- # @@ -46530,6 +46577,50 @@ TethzorokorWalking: TethzorokorWalkingToIdle: playfram 0x00 goto TethzorokorLocal00 + +TethzorokorSpecialState2: + playfram 0x4A0 + goto ZoryusthalethLocal07 + +TethzorokorBurrow: + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x1E0 + wait 1 + playfram 0x200 + wait 1 + playfram 0x220 + wait 1 + playfram 0x240 + wait 1 + playfram 0x4A0 + wait 1 + sigorder 4 + goto ZoryusthalethLocal07 + +TethzorokorUnBurrow: + wait 1 + waitrand 1 2 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x240 + wait 1 + playfram 0x220 + wait 1 + playfram 0x200 + wait 1 + playfram 0x1E0 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x1A0 + wait 1 + sigorder 4 + goto TethzorokorWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -46635,7 +46726,7 @@ AionLocal00: # 1554 Protathalor (cm\zerg\protathalor.grp) .headerstart IsId 694 -Type 21 +Type 26 Init ProtathalorInit Death ProtathalorDeath GndAttkInit ProtathalorGndAttkInit @@ -46650,7 +46741,7 @@ Unused2 [NONE] Walking ProtathalorWalking WalkingToIdle ProtathalorWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] +SpecialState2 ProtathalorSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -46658,6 +46749,12 @@ LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow ProtathalorBurrow +UnBurrow ProtathalorUnBurrow +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -46786,7 +46883,7 @@ ProtathalorCastSpell: ProtathalorWalking: move 5 - playfram 0xe0 + playfram 0xE0 wait 1 move 5 playfram 0x100 @@ -46819,12 +46916,56 @@ ProtathalorWalkingToIdle: playfram 0x00 goto ProtathalorLocal00 +ProtathalorSpecialState2: + playfram 0x340 + goto ZoryusthalethLocal07 + +ProtathalorBurrow: + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0xE0 + wait 1 + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 1 + playfram 0x340 + wait 1 + sigorder 4 + goto ZoryusthalethLocal07 + +ProtathalorUnBurrow: + wait 1 + waitrand 1 2 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x180 + wait 1 + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x100 + wait 1 + playfram 0xE0 + wait 1 + sigorder 4 + goto ProtathalorWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1569 Vilgorokor (cm\zerg\vilgorokor.grp) .headerstart IsId 695 -Type 21 +Type 26 Init VilgorokorInit Death VilgorokorDeath GndAttkInit VilgorokorGndAttkInit @@ -46832,14 +46973,14 @@ AirAttkInit VilgorokorGndAttkInit Unused1 VilgorokorUnused1 GndAttkRpt VilgorokorGndAttkInit AirAttkRpt VilgorokorGndAttkInit -CastSpell VilgorokorCastSpell +CastSpell [NONE] GndAttkToIdle VilgorokorGndAttkToIdle AirAttkToIdle VilgorokorGndAttkToIdle Unused2 [NONE] Walking VilgorokorWalking WalkingToIdle VilgorokorWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] +SpecialState2 VilgorokorSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -46847,6 +46988,12 @@ LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow VilgorokorBurrow +UnBurrow VilgorokorUnBurrow +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -46939,36 +47086,6 @@ VilgorokorGndAttkToIdle: wait 1 goto VilgorokorLocal00 -VilgorokorCastSpell: - playfram 0x00 - wait 1 - nobrkcodestart - playfram 0x200 - wait 1 - playfram 0x220 - wait 1 - playfram 0x240 - wait 1 - playfram 0x260 - wait 1 - playfram 0x280 - wait 1 - playfram 0x2A0 - wait 1 - playfram 0x2C0 - playsndbtwn 2014 2015 # Liiralisk attack 01, 02 - castspell - wait 1 - playfram 0x2E0 - wait 1 - playfram 0x300 - wait 1 - playfram 0x320 - wait 1 - nobrkcodeend - gotorepeatattk - goto VilgorokorGndAttkToIdle - VilgorokorWalking: move 5 playfram 0x55 @@ -47012,13 +47129,62 @@ VilgorokorWalking: VilgorokorWalkingToIdle: playfram 0x00 goto VilgorokorLocal00 + +VilgorokorSpecialState2: + playfram 0x198 + goto ZoryusthalethLocal07 + +VilgorokorBurrow: + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + playfram 0x77 + wait 1 + playfram 0x88 + wait 1 + playfram 0x99 + 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 0xaa + wait 1 + playfram 0x198 + wait 1 + sigorder 4 + goto ZoryusthalethLocal07 + +VilgorokorUnBurrow: + wait 1 + waitrand 1 2 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0xaa + wait 1 + playfram 0x99 + wait 1 + playfram 0x88 + wait 1 + playfram 0x77 + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x66 + wait 1 + playfram 0x55 + wait 1 + sigorder 4 + goto VilgorokorGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1372 Cikralisk (cm\zerg\cikralisk.grp) .headerstart IsId 696 -Type 21 +Type 26 Init CikraliskInit Death CikraliskDeath GndAttkInit CikraliskGndAttkInit @@ -47033,7 +47199,7 @@ Unused2 [NONE] Walking CikraliskWalking WalkingToIdle CikraliskWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] +SpecialState2 CikraliskSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -47041,6 +47207,12 @@ LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow CikraliskBurrow +UnBurrow CikraliskUnBurrow +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -47232,6 +47404,44 @@ CikraliskWalkingToIdle: playfram 0x00 goto CikraliskLocal00 +CikraliskSpecialState2: + playfram 0x1A0 + goto ZoryusthalethLocal07 + +CikraliskBurrow: + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0x1A0 + sigorder 4 + wait 1 + goto ZoryusthalethLocal07 + +CikraliskUnBurrow: + wait 1 + waitrand 1 2 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0xA0 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + sigorder 4 + goto CikraliskWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1395 Tosgrilisk (cm\zerg\tosgrilisk.grp) @@ -51157,7 +51367,7 @@ Unused2 [NONE] Walking MortothrokorWalking WalkingToIdle MortothrokorGndAttkToIdle SpecialState1 [NONE] -SpecialState2 [NONE] +SpecialState2 MortothrokorSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -51168,8 +51378,8 @@ WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] +Burrow MortothrokorBurrow +UnBurrow MortothrokorUnBurrow Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -51336,6 +51546,50 @@ MortothrokorWalking: move 4 wait 1 goto MortothrokorWalking + +MortothrokorSpecialState2: + playfram 0xAF + goto ZoryusthalethLocal07 + +MortothrokorBurrow: + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x22 + wait 1 + playfram 0x11 + wait 1 + playfram 0xAF + wait 1 + sigorder 4 + goto ZoryusthalethLocal07 + +MortothrokorUnBurrow: + wait 1 + waitrand 1 2 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x44 + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + wait 1 + playfram 0x11 + wait 1 + sigorder 4 + goto MortothrokorGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/zerg/axitrilisk.grp b/mpq/unit/cm/zerg/axitrilisk.grp index 92a7fd22..ea7dbba1 100644 Binary files a/mpq/unit/cm/zerg/axitrilisk.grp and b/mpq/unit/cm/zerg/axitrilisk.grp differ diff --git a/mpq/unit/cm/zerg/cikralisk.grp b/mpq/unit/cm/zerg/cikralisk.grp index 62f45875..0db9aa8d 100644 Binary files a/mpq/unit/cm/zerg/cikralisk.grp and b/mpq/unit/cm/zerg/cikralisk.grp differ diff --git a/mpq/unit/cm/zerg/evigrilisk.grp b/mpq/unit/cm/zerg/evigrilisk.grp index c205efed..40734a71 100644 Binary files a/mpq/unit/cm/zerg/evigrilisk.grp and b/mpq/unit/cm/zerg/evigrilisk.grp differ diff --git a/mpq/unit/cm/zerg/keskathalor.grp b/mpq/unit/cm/zerg/keskathalor.grp index 2397f8b9..de4f5349 100644 Binary files a/mpq/unit/cm/zerg/keskathalor.grp and b/mpq/unit/cm/zerg/keskathalor.grp differ diff --git a/mpq/unit/cm/zerg/mortothrokor.grp b/mpq/unit/cm/zerg/mortothrokor.grp index 38346815..a997d224 100644 Binary files a/mpq/unit/cm/zerg/mortothrokor.grp and b/mpq/unit/cm/zerg/mortothrokor.grp differ diff --git a/mpq/unit/cm/zerg/protathalor.grp b/mpq/unit/cm/zerg/protathalor.grp index 96a1c9a9..15976a2f 100644 Binary files a/mpq/unit/cm/zerg/protathalor.grp and b/mpq/unit/cm/zerg/protathalor.grp differ diff --git a/mpq/unit/cm/zerg/tethzorokor.grp b/mpq/unit/cm/zerg/tethzorokor.grp index 11d7c91d..11494b2a 100644 Binary files a/mpq/unit/cm/zerg/tethzorokor.grp and b/mpq/unit/cm/zerg/tethzorokor.grp differ diff --git a/mpq/unit/cm/zerg/vilgorokor.grp b/mpq/unit/cm/zerg/vilgorokor.grp index e01431c9..97fb06bf 100644 Binary files a/mpq/unit/cm/zerg/vilgorokor.grp and b/mpq/unit/cm/zerg/vilgorokor.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index b2d47e88..4753fb80 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ