diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 5a892b62..17ef2cf9 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 6a6974c8..6f92d11b 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 10998754..55f5764d 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2464,9 +2464,9 @@ Crushing Delivery Large Maverick (Golden) Maverick (Golden) Shadow Maverick (Golden) Remains -Extended Image #1464 -Extended Image #1465 -Extended Image #1466 +Garvrokor Shadow +Garvrokor Birth +Garvrokor Remains Extended Image #1467 Extended Image #1468 Extended Image #1469 diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 2d588e58..bd4c79cd 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 687ea754..8156a7f2 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -14442,7 +14442,7 @@ IsId 754 Type 13 Init ZergMutateInit Death EggDeath -GndAttkInit [NONE] +GndAttkInit ZergMutateInit AirAttkInit [NONE] Unused1 [NONE] GndAttkRpt [NONE] @@ -19780,4 +19780,143 @@ AlzurokorUnBurrow: imgol 423 -15 9 # Burrowing Dust (thingy\bDust.grp) wait 1 sigorder 4 - goto AlzurokorGndAttkToIdle \ No newline at end of file + goto AlzurokorGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2204 Garvrokor (cm\zerg\garvrokor.grp) +.headerstart +IsId 848 +Type 26 +Init GarvrokorInit +Death GarvrokorDeath +GndAttkInit GarvrokorGndAttkInit +AirAttkInit [NONE] +Unused1 SkryrokorLocal00 +GndAttkRpt GarvrokorGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle GarvrokorGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking GarvrokorWalking +WalkingToIdle GarvrokorGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 GarvrokorSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow GarvrokorBurrow +UnBurrow GarvrokorUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +GarvrokorInit: + imgul 2466 -1 -5 # Garvrokor Shadow (cm\zerg\garvrokor-shadow.grp) +GarvrokorGndAttkToIdle: + playfram 0x55 + goto ZethrokorLocal00 + +GarvrokorDeath: + playsnd 1160 # Garvrokor death 01 + setfldirect 0 + playfram 0x121 + wait 2 + playfram 290 + wait 2 + playfram 291 + wait 2 + playfram 292 + wait 2 + playfram 293 + wait 2 + playfram 294 + wait 2 + playfram 295 + wait 2 + lowsprul 942 0 0 # Garvrokor Remnants (cm\zerg\garvrokor-death.grp) + wait 1 + end + +GarvrokorGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x11 + wait 1 + playfram 0x22 + attackmelee 1 894 # Zerg\Ultra\zulHit00.WAV + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + nobrkcodeend + gotorepeatattk + goto GarvrokorGndAttkToIdle + +GarvrokorWalking: + move 7 + wait 1 + playfram 0x66 + move 7 + wait 1 + playfram 0x77 + move 7 + wait 1 + playfram 0x88 + move 7 + wait 1 + playfram 0x99 + move 7 + wait 1 + playfram 0xaa + move 7 + wait 1 + playfram 0xbb + move 7 + wait 1 + playfram 0x55 + goto GarvrokorWalking + +GarvrokorSpecialState2: + playfram 0x110 + goto SkryrokorLocal00 + +GarvrokorBurrow: + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0xcc + wait 1 + playfram 0xdd + wait 1 + playfram 0xee + wait 1 + playfram 0xff + wait 1 + playfram 0x110 + wait 1 + sigorder 4 + goto SkryrokorLocal00 + +GarvrokorUnBurrow: + wait 1 + waitrand 1 2 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0xff + wait 1 + playfram 0xee + wait 1 + playfram 0xdd + wait 1 + playfram 0xcc + wait 1 + sigorder 4 + goto GarvrokorGndAttkToIdle \ No newline at end of file diff --git a/mpq/unit/cm/f-z/garvrokor-birth.grp b/mpq/unit/cm/f-z/garvrokor-birth.grp new file mode 100644 index 00000000..18609b3e Binary files /dev/null and b/mpq/unit/cm/f-z/garvrokor-birth.grp differ diff --git a/mpq/unit/cm/f-z/garvrokor-remains.grp b/mpq/unit/cm/f-z/garvrokor-remains.grp new file mode 100644 index 00000000..b15b36fc Binary files /dev/null and b/mpq/unit/cm/f-z/garvrokor-remains.grp differ diff --git a/mpq/unit/cm/f-z/garvrokor-shadow.grp b/mpq/unit/cm/f-z/garvrokor-shadow.grp new file mode 100644 index 00000000..63cf8fc6 Binary files /dev/null and b/mpq/unit/cm/f-z/garvrokor-shadow.grp differ diff --git a/mpq/unit/cm/z/vorvrokor-birth.grp b/mpq/unit/cm/z/vorvrokor-birth.grp index d53c8f25..473412f4 100644 Binary files a/mpq/unit/cm/z/vorvrokor-birth.grp and b/mpq/unit/cm/z/vorvrokor-birth.grp differ diff --git a/mpq/unit/cm/z/vorvrokor-remains.grp b/mpq/unit/cm/z/vorvrokor-remains.grp index 715df67b..5a4a444f 100644 Binary files a/mpq/unit/cm/z/vorvrokor-remains.grp and b/mpq/unit/cm/z/vorvrokor-remains.grp differ diff --git a/mpq/unit/cm/z/vorvrokor.grp b/mpq/unit/cm/z/vorvrokor.grp index a7051e5b..3eeb4bda 100644 Binary files a/mpq/unit/cm/z/vorvrokor.grp and b/mpq/unit/cm/z/vorvrokor.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 013344b8..523b4129 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ