diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 6f1d48d8..098c07fe 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 0e04edb4..cdff6c0b 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -662,7 +662,7 @@ Missionary Weaponhit Maverick (Upstart) Vulture (Upstart) Goremast -Eidolon (Upstart) +Morrigan Cutlass Cutlass Turret Broadside @@ -712,7 +712,7 @@ Arquebus (Hecaton) Acqui Alzurokor (Imicren) Hydrokor (Goszirith) -Extended Flingy #506 +Nihilist Extended Flingy #507 Extended Flingy #508 Extended Flingy #509 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index ab936dd2..a268e9bf 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 c242f8c0..71db4c8f 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 c2de2b31..3c970cba 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2311,9 +2311,9 @@ Vulture (Upstart) Shadow Vulture (Upstart) Engine Goremast Goremast Shadow -Eidolon (Upstart) -Eidolon (Upstart) Shadow -Eidolon (Upstart) Remains +Morrigan +Morrigan Shadow +Morrigan Remains Cutlass Cutlass Shadow Cutlass Turret @@ -2446,14 +2446,14 @@ Hydrokor (Goszirith) Birth Hydrokor (Goszirith) Remains Hydrokor (Goszirith) Mutate Hydralisk Mutate -Extended Image #1446 -Extended Image #1447 -Extended Image #1448 -Extended Image #1449 -Extended Image #1450 -Extended Image #1451 -Extended Image #1452 -Extended Image #1453 +Nihilist +Nihilist Shadow +Sorvrokor Remains +Sovrokor Shadow +Sovrokor Birth +Sovrokor Mutate +Zethrokor Mutate +Eidolon (Nydus) Remains Extended Image #1454 Extended Image #1455 Extended Image #1456 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index 09673abf..1d20bf2e 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl index 00eaee39..9208182c 100644 Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index 1bfd920b..98e36538 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -308,7 +308,7 @@ Ferrum Prophet 1 Prophet 2 Bloodsummon Advisor -Extended Portrait #201 +Vestige Extended Portrait #202 Extended Portrait #203 Extended Portrait #204 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 84aae0f6..35f1f049 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 071877bd..775a2b78 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1118,7 +1118,7 @@ Maverick (Upstart) Maverick (Upstart) Remains Vulture (Upstart) Goremast -Eidolon (Upstart) +Morrigan Cutlass Cutlass Turret Broadside @@ -1180,10 +1180,10 @@ Alzurokor (Imicren) Hydrokor (Goszirith) Alzurokor Remains Hydrokor Remains -Extended Sprite #666 -Extended Sprite #667 -Extended Sprite #668 -Extended Sprite #669 +Nihilist +Sovrokor Remains +Eidolon (Nydus) Remains +Morrigan Remains Extended Sprite #670 Extended Sprite #671 Extended Sprite #672 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 4394a3cf..54f829a4 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 537c5dc8..5b3b0cb5 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -629,7 +629,7 @@ Zerg Hydrokor (Goszirith) Protoss Gladius (Order) Terran Eidolon (Golden Republic) Zerg Zethalisk (Orkoti) -Extended Unit #404 +Bloodsummon Nihilist Extended Unit #405 Extended Unit #406 Extended Unit #407 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index a040ed5d..cdc29ef2 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 002e0fdd..5829c936 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/f/advisor_upstartterran/fid00.smk b/mpq/portrait/f/advisor_upstartt/fid00.smk similarity index 100% rename from mpq/portrait/f/advisor_upstartterran/fid00.smk rename to mpq/portrait/f/advisor_upstartt/fid00.smk diff --git a/mpq/portrait/f/advisor_upstartterran/tlk00.smk b/mpq/portrait/f/advisor_upstartt/tlk00.smk similarity index 100% rename from mpq/portrait/f/advisor_upstartterran/tlk00.smk rename to mpq/portrait/f/advisor_upstartt/tlk00.smk diff --git a/mpq/portrait/f/advisor_upstartterran/tlk01.smk b/mpq/portrait/f/advisor_upstartt/tlk01.smk similarity index 100% rename from mpq/portrait/f/advisor_upstartterran/tlk01.smk rename to mpq/portrait/f/advisor_upstartt/tlk01.smk diff --git a/mpq/portrait/f/vestige/fid00.smk b/mpq/portrait/f/vestige/fid00.smk new file mode 100644 index 00000000..370f396b Binary files /dev/null and b/mpq/portrait/f/vestige/fid00.smk differ diff --git a/mpq/portrait/f/vestige/fid01.smk b/mpq/portrait/f/vestige/fid01.smk new file mode 100644 index 00000000..235305b0 Binary files /dev/null and b/mpq/portrait/f/vestige/fid01.smk differ diff --git a/mpq/portrait/f/vestige/fid02.smk b/mpq/portrait/f/vestige/fid02.smk new file mode 100644 index 00000000..a720b936 Binary files /dev/null and b/mpq/portrait/f/vestige/fid02.smk differ diff --git a/mpq/portrait/f/vestige/tlk00.smk b/mpq/portrait/f/vestige/tlk00.smk new file mode 100644 index 00000000..fe0baa41 Binary files /dev/null and b/mpq/portrait/f/vestige/tlk00.smk differ diff --git a/mpq/portrait/f/vestige/tlk01.smk b/mpq/portrait/f/vestige/tlk01.smk new file mode 100644 index 00000000..cb410279 Binary files /dev/null and b/mpq/portrait/f/vestige/tlk01.smk differ diff --git a/mpq/portrait/f/vestige/tlk02.smk b/mpq/portrait/f/vestige/tlk02.smk new file mode 100644 index 00000000..22284c58 Binary files /dev/null and b/mpq/portrait/f/vestige/tlk02.smk differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 381d854a..ffbb138b 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -566,7 +566,7 @@ s<1><4>Raise Missionary <1>(<3>S<1>)<10>All-purpose trooper.<0> s<1><4>Raise Proselyte <1>(<3>S<1>)<10>Nimble trooper.<0> g<1><4>Morph into Agrileth <1>(<3>G<1>)<10>Construction strain.<0> x<1><4>Build Aion <1>(<3>X<1>)<10>Reclaiming armor.<0> -t<1><4>Morph into Nathrelisk <1>(<3>R<1>)<10>Sustaining fighter strain.<0> +r<1><4>Morph into Nathrelisk <1>(<3>R<1>)<10>Sustaining fighter strain.<0> ¤<3><4>Corrosive Pathogen <2>(passive)<10>This strain's attacks debuff all hostiles within 4 range of their target, reducing their attack speed by 25% and armor by 1 for 3 seconds.<0> ¤<3><4>Corrosive Touch <2>(passive)<10>This strain's attacks debuff enemies, increasing attack cooldown by 25% and reducing armor by 1 for 3 seconds.<0> Nathrelisk requires:<10> Vornath Pond<0> @@ -1334,7 +1334,7 @@ Must target units with energy.<0> <0> <0> <0> -<0> +¤<3><4>War Atrophy <2>(passive)<10>When a target is damaged by the Nihilist, it becomes atrophied, reducing its movement speed by 33% when moving towards its enemies.<0> ¤<3><4>Necromastery <2>(passive)<10>The Grimoire can pay host to a single allied combatant. When other combatants of the same type die, a new one begins training at the Grimoire, free of cost.<0> ¤<3><4>Tragyle's Coagulants <2>(passive)<10>Victims of the Camazotz's attacks react favorably to the serum within, and bleed a miasma that restores 3 HP to allies of the Harakan within 2 range.<0> f<1><4>Train Camazotz <1>(<3>F<1>)<10>Sustaining infantry.<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 7b8918b5..520490ae 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 6f5bd65b..f66ceb74 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_bloodsummon.bin b/mpq/scripts/iscript_bloodsummon.bin index 08f1f94b..19572355 100644 Binary files a/mpq/scripts/iscript_bloodsummon.bin and b/mpq/scripts/iscript_bloodsummon.bin differ diff --git a/mpq/scripts/iscript_bloodsummon.txt b/mpq/scripts/iscript_bloodsummon.txt index b42dd5b9..0621080e 100644 --- a/mpq/scripts/iscript_bloodsummon.txt +++ b/mpq/scripts/iscript_bloodsummon.txt @@ -1036,4 +1036,217 @@ AcquiLocal00: wait 2 playfram 0x2C0 wait 2 - goto AcquiLocal00 \ No newline at end of file + goto AcquiLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2448 Nihilist (cm\b\nihilist.grp) +.headerstart +IsId 3 +Type 21 +Init NihilistInit +Death NihilistDeath +GndAttkInit NihilistGndAttkInit +AirAttkInit NihilistGndAttkInit +Unused1 NihilistUnused1 +GndAttkRpt NihilistGndAttkInit +AirAttkRpt NihilistGndAttkInit +CastSpell [NONE] +GndAttkToIdle NihilistGndAttkToIdle +AirAttkToIdle NihilistGndAttkToIdle +Unused2 [NONE] +Walking NihilistWalking +WalkingToIdle NihilistWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +NihilistInit: + imgulnextid 0 3 # Nihilist Shadow (cm\b\nihilist-shadow.grp) + goto NihilistWalkingToIdle + +NihilistWalkingToIdle: + playfram 0x00 + wait 1 + waitrand 24 79 + goto NihilistFidget + +NihilistFidget: + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + 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 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x1E0 + wait 1 + playfram 0x200 + goto NihilistWalkingToIdle + +NihilistDeath: + imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) + playsndbtwn 1707 1708 # Quazilisk death 01, 02 + playfram 0x5A0 + wait 1 + playfram 0x5C0 + wait 1 + playfram 0x5E0 + wait 1 + playfram 0x600 + wait 1 + playfram 0x620 + wait 1 + lowsprul 1168 0 0 # Bloodsummon Unit Rubble Small + playfram 0x640 + wait 1 + playfram 0x660 + wait 1 + playfram 0x680 + wait 1 + playfram 0x6A0 + wait 1 + playfram 0x6C0 + wait 1 + playfram 0x6E0 + wait 1 + playfram 0x700 + wait 1 + playfram 0x720 + wait 1 + end + +NihilistUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1171 + playfram 0x210 +# wait 2 +# playfram 0xaa +# wait 2 +# playfram 0xbb +# wait 2 +# playfram 0xcc +# wait 2 +# playfram 0xdd +# wait 2 +# playfram 0xee +# wait 2 +# playfram 0xff +# wait 2 + wait 14 + setfldirect 10 + nobrkcodeend + goto NihilistWalkingToIdle + +NihilistGndAttkInit: + playfram 0x3A0 + wait 1 + playfram 0x3C0 + wait 1 + nobrkcodestart + playfram 0x3E0 + wait 1 + playfram 0x400 + attackmelee 2 4266 4268 # Rozirokor weaponhit 01, 02, 03 + wait 1 + playfram 0x420 + wait 1 + nobrkcodeend + playfram 0x440 + wait 1 + playfram 0x460 + wait 1 + playfram 0x480 + wait 1 + playfram 0x4A0 + wait 1 + playfram 0x4C0 + wait 1 + playfram 0x4E0 + wait 1 + playfram 0x500 + wait 1 + playfram 0x520 + wait 1 + playfram 0x540 + wait 1 + playfram 0x560 + wait 1 + playfram 0x580 + wait 1 + gotorepeatattk + ignorerest +NihilistGndAttkToIdle: + playfram 0x3A0 + wait 1 + goto NihilistWalkingToIdle + +NihilistWalking: + move 4 + wait 1 + playfram 0x220 + move 4 + wait 1 + playfram 0x240 + move 4 + wait 1 + playfram 0x260 + move 4 + wait 1 + playfram 0x280 + move 4 + wait 1 + playfram 0x2A0 + move 4 + wait 1 + playfram 0x2C0 + move 4 + wait 1 + playfram 0x2E0 + move 4 + wait 1 + playfram 0x300 + move 4 + wait 1 + playfram 0x320 + move 4 + wait 1 + playfram 0x340 + move 4 + wait 1 + playfram 0x360 + move 4 + wait 1 + playfram 0x380 + goto NihilistWalking \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 318b174e..ddd6656c 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index c8eb51ef..19a4745d 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -392,7 +392,7 @@ HarakanWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 228 Eidolon (terran\ghost.grp) +# 228 Eidolon (terran\eidolon.grp) .headerstart IsId 70 Type 13 @@ -414,9 +414,9 @@ SpecialState1 EidolonSpecialState1 # ----------------------------------------------------------------------------- # EidolonInit: - imgul 229 0 0 # Eidolon Shadow (terran\tghShad.grp) + imgulnextid 0 0 # Eidolon Shadow (terran\eidolon-shadow.grp) EidolonWalkingToIdle: - playfram 0x33 + playfram 0x60 EidolonLocal00: wait 63 randcondjmp 25 EidolonLocal01 @@ -426,9 +426,9 @@ EidolonLocal00: EidolonLocal01: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 randcondjmp 192 EidolonLocal03 turnccwise 2 wait 3 @@ -461,7 +461,7 @@ EidolonLocal01: goto EidolonLocal04 EidolonLocal04: - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 @@ -469,20 +469,20 @@ EidolonLocal04: EidolonLocal03: wait 13 - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 goto EidolonWalkingToIdle EidolonLocal02: - playfram 0x44 + playfram 0x80 wait 1 - playfram 0x55 + playfram 0xA0 wait 1 turnrand 3 wait 1 - playfram 0x44 + playfram 0x80 wait 1 goto EidolonWalkingToIdle @@ -495,21 +495,21 @@ EidolonUnused1: nobrkcodestart setfldirect 0 playsnd 1166 # Eidolon revive 01 - playfram 228 + playfram 423 wait 2 - playfram 227 + playfram 422 wait 2 - playfram 226 + playfram 421 wait 2 - playfram 225 + playfram 420 wait 2 - playfram 224 + playfram 419 wait 2 - playfram 223 + playfram 418 wait 2 - playfram 222 + playfram 417 wait 2 - playfram 221 + playfram 416 wait 2 setfldirect 12 nobrkcodeend @@ -518,18 +518,18 @@ EidolonUnused1: EidolonGndAttkInit: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 sigorder 32 - playfram 0x22 + playfram 0x40 wait 12 EidolonGndAttkRpt: wait 1 nobrkcodestart attack - playfram 0xcc + playfram 0x180 wait 1 - playfram 0x22 + playfram 0x40 nobrkcodeend gotorepeatattk ignorerest @@ -545,9 +545,9 @@ EidolonCastSpell: wait 1 playsnd 240 # Terran\GHOST\TGhLkd00.wav castspell - playfram 0xcc + playfram 0x180 wait 2 - playfram 0x22 + playfram 0x40 nobrkcodeend gotorepeatattk sigorder 2 @@ -556,45 +556,45 @@ EidolonCastSpell: EidolonWalking: move 4 wait 1 - playfram 0x44 + playfram 0x80 move 4 wait 1 - playfram 0x55 + playfram 0xA0 move 4 wait 1 - playfram 0x66 + playfram 0xC0 move 4 wait 1 - playfram 0x77 + playfram 0xE0 move 4 wait 1 - playfram 0x88 + playfram 0x100 move 4 wait 1 - playfram 0x99 + playfram 0x120 move 4 wait 1 - playfram 0xaa + playfram 0x140 move 4 wait 1 - playfram 0xbb + playfram 0x160 move 4 wait 1 - playfram 0x33 + playfram 0x60 goto EidolonWalking EidolonSpecialState1: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 wait 1 goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 231 Eidolon Death (terran\ghost.grp) +# 231 Eidolon Death (terran\eidolon.grp) .headerstart IsId 72 Type 1 @@ -605,23 +605,23 @@ Death Generic_Wait1End EidolonDeathInit: setfldirect 0 - playfram 0xdd - wait 2 - playfram 222 - wait 2 - playfram 223 - wait 2 - playfram 224 - wait 2 - playfram 225 - wait 2 - playfram 226 - wait 2 - playfram 227 - wait 2 - playfram 228 - wait 2 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + playfram 416 + wait 2 + playfram 417 + wait 2 + playfram 418 + wait 2 + playfram 419 + wait 2 + playfram 420 + wait 2 + playfram 421 + wait 2 + playfram 422 + wait 2 + playfram 423 + wait 2 + lowsprul 230 0 0 # Eidolon Remnants (terran\eidolon-remains.grp) wait 1 end @@ -12613,7 +12613,7 @@ SirenDeath: playsnd 353 # Terran\VULTURE\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 2 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + lowsprul 845 0 0 # Terran Unit Rubble Small wait 1 wait 3 end @@ -13354,7 +13354,7 @@ StrigaDeath: playfram 0x00 imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) wait 2 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + lowsprul 845 0 0 # Terran Unit Rubble Small wait 1 end @@ -16221,7 +16221,7 @@ SevenstepDeath: playsndbtwn 276 277 # Maverick death 01, 02 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 2 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + lowsprul 845 0 0 # Terran Unit Rubble Small wait 1 end @@ -19730,7 +19730,7 @@ MadrigalHecatonImperiosoTurretGndAttkInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2011 Eidolon (Nydus Trinity) (cm\faction-t\eidolon-nydus.grp) +# 2011 Eidolon (Nydus Trinity) (cm\f-t\eidolon-nydus.grp) .headerstart IsId 835 Type 13 @@ -19752,9 +19752,9 @@ SpecialState1 EidolonNydusSpecialState1 # ----------------------------------------------------------------------------- # EidolonNydusInit: - imgul 2012 0 0 # Eidolon (Nydus) Shadow (terran\tghShad.grp) + imgulnextid 0 0 # Eidolon (Nydus) Shadow (cm\f-t\eidolon-nydus-shadow.grp) EidolonNydusWalkingToIdle: - playfram 0x33 + playfram 0x60 EidolonNydusLocal00: wait 63 randcondjmp 25 EidolonNydusLocal01 @@ -19764,9 +19764,9 @@ EidolonNydusLocal00: EidolonNydusLocal01: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 randcondjmp 192 EidolonNydusLocal03 turnccwise 2 wait 3 @@ -19799,7 +19799,7 @@ EidolonNydusLocal01: goto EidolonNydusLocal04 EidolonNydusLocal04: - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 @@ -19807,20 +19807,20 @@ EidolonNydusLocal04: EidolonNydusLocal03: wait 13 - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 goto EidolonNydusWalkingToIdle EidolonNydusLocal02: - playfram 0x44 + playfram 0x80 wait 1 - playfram 0x55 + playfram 0xA0 wait 1 turnrand 3 wait 1 - playfram 0x44 + playfram 0x80 wait 1 goto EidolonNydusWalkingToIdle @@ -19832,22 +19832,22 @@ EidolonNydusUnused1: wait 1 nobrkcodestart setfldirect 0 - playsnd 1166 # Eidolon revive 01 - playfram 228 + playsnd 1166 # EidolonNydus revive 01 + playfram 423 wait 2 - playfram 227 + playfram 422 wait 2 - playfram 226 + playfram 421 wait 2 - playfram 225 + playfram 420 wait 2 - playfram 224 + playfram 419 wait 2 - playfram 223 + playfram 418 wait 2 - playfram 222 + playfram 417 wait 2 - playfram 221 + playfram 416 wait 2 setfldirect 12 nobrkcodeend @@ -19856,16 +19856,16 @@ EidolonNydusUnused1: EidolonNydusGndAttkInit: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 EidolonNydusGndAttkRpt: wait 1 nobrkcodestart attack - playfram 0xcc + playfram 0x180 wait 1 - playfram 0x22 + playfram 0x40 nobrkcodeend gotorepeatattk ignorerest @@ -19881,9 +19881,9 @@ EidolonNydusCastSpell: wait 1 playsnd 240 # Terran\GHOST\TGhLkd00.wav castspell - playfram 0xcc + playfram 0x180 wait 2 - playfram 0x22 + playfram 0x40 nobrkcodeend gotorepeatattk sigorder 2 @@ -19892,39 +19892,39 @@ EidolonNydusCastSpell: EidolonNydusWalking: move 4 wait 1 - playfram 0x44 + playfram 0x80 move 4 wait 1 - playfram 0x55 + playfram 0xA0 move 4 wait 1 - playfram 0x66 + playfram 0xC0 move 4 wait 1 - playfram 0x77 + playfram 0xE0 move 4 wait 1 - playfram 0x88 + playfram 0x100 move 4 wait 1 - playfram 0x99 + playfram 0x120 move 4 wait 1 - playfram 0xaa + playfram 0x140 move 4 wait 1 - playfram 0xbb + playfram 0x160 move 4 wait 1 - playfram 0x33 + playfram 0x60 goto EidolonNydusWalking EidolonNydusSpecialState1: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 wait 1 goto SkryrokorLocal00 diff --git a/mpq/unit/cm/b/nihilist-shadow.grp b/mpq/unit/cm/b/nihilist-shadow.grp new file mode 100644 index 00000000..ebacf86d Binary files /dev/null and b/mpq/unit/cm/b/nihilist-shadow.grp differ diff --git a/mpq/unit/cm/b/nihilist.grp b/mpq/unit/cm/b/nihilist.grp new file mode 100644 index 00000000..ebacf86d Binary files /dev/null and b/mpq/unit/cm/b/nihilist.grp differ diff --git a/mpq/unit/cm/f-t/eidolon-nydus-attack.lol b/mpq/unit/cm/f-t/eidolon-nydus-attack.lol new file mode 100644 index 00000000..4539ce8a Binary files /dev/null and b/mpq/unit/cm/f-t/eidolon-nydus-attack.lol differ diff --git a/mpq/unit/cm/f-t/eidolon-nydus-remains.grp b/mpq/unit/cm/f-t/eidolon-nydus-remains.grp new file mode 100644 index 00000000..333e186f Binary files /dev/null and b/mpq/unit/cm/f-t/eidolon-nydus-remains.grp differ diff --git a/mpq/unit/cm/f-t/eidolon-nydus-shadow.grp b/mpq/unit/cm/f-t/eidolon-nydus-shadow.grp new file mode 100644 index 00000000..e5008433 Binary files /dev/null and b/mpq/unit/cm/f-t/eidolon-nydus-shadow.grp differ diff --git a/mpq/unit/cm/f-t/eidolon-nydus.grp b/mpq/unit/cm/f-t/eidolon-nydus.grp index 32415fb9..84e5949f 100644 Binary files a/mpq/unit/cm/f-t/eidolon-nydus.grp and b/mpq/unit/cm/f-t/eidolon-nydus.grp differ diff --git a/mpq/unit/cm/f-t/morrigan-remains.grp b/mpq/unit/cm/f-t/morrigan-remains.grp index fe9c2f98..12c2e44c 100644 Binary files a/mpq/unit/cm/f-t/morrigan-remains.grp and b/mpq/unit/cm/f-t/morrigan-remains.grp differ diff --git a/mpq/unit/cm/f-t/morrigan-shadow.grp b/mpq/unit/cm/f-t/morrigan-shadow.grp index 22973e20..e5008433 100644 Binary files a/mpq/unit/cm/f-t/morrigan-shadow.grp and b/mpq/unit/cm/f-t/morrigan-shadow.grp differ diff --git a/mpq/unit/cm/f-t/morrigan.grp b/mpq/unit/cm/f-t/morrigan.grp index 3dd302f2..3bc9e690 100644 Binary files a/mpq/unit/cm/f-t/morrigan.grp and b/mpq/unit/cm/f-t/morrigan.grp differ diff --git a/mpq/unit/cm/f-z/sovrokor-birth.grp b/mpq/unit/cm/f-z/sovrokor-birth.grp new file mode 100644 index 00000000..2ae26390 Binary files /dev/null and b/mpq/unit/cm/f-z/sovrokor-birth.grp differ diff --git a/mpq/unit/cm/f-z/sovrokor-mutate.grp b/mpq/unit/cm/f-z/sovrokor-mutate.grp new file mode 100644 index 00000000..eb2ba7fc Binary files /dev/null and b/mpq/unit/cm/f-z/sovrokor-mutate.grp differ diff --git a/mpq/unit/cm/f-z/sovrokor-remains.grp b/mpq/unit/cm/f-z/sovrokor-remains.grp new file mode 100644 index 00000000..2290f71e Binary files /dev/null and b/mpq/unit/cm/f-z/sovrokor-remains.grp differ diff --git a/mpq/unit/cm/f-z/sovrokor-shadow.grp b/mpq/unit/cm/f-z/sovrokor-shadow.grp new file mode 100644 index 00000000..869744e0 Binary files /dev/null and b/mpq/unit/cm/f-z/sovrokor-shadow.grp differ diff --git a/mpq/unit/cm/f-z/sovrokor.grp b/mpq/unit/cm/f-z/sovrokor.grp index 3a8775ea..a19a6953 100644 Binary files a/mpq/unit/cm/f-z/sovrokor.grp and b/mpq/unit/cm/f-z/sovrokor.grp differ diff --git a/mpq/unit/cm/t/eidolon-attack.lol b/mpq/unit/cm/t/eidolon-attack.lol new file mode 100644 index 00000000..4539ce8a Binary files /dev/null and b/mpq/unit/cm/t/eidolon-attack.lol differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 161e0330..a9c1ed14 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index 393f9a57..72cc8aaf 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/eidolon-attack.lol b/mpq/unit/terran/eidolon-attack.lol new file mode 100644 index 00000000..4539ce8a Binary files /dev/null and b/mpq/unit/terran/eidolon-attack.lol differ diff --git a/mpq/unit/terran/eidolon-remains.grp b/mpq/unit/terran/eidolon-remains.grp new file mode 100644 index 00000000..2630de76 Binary files /dev/null and b/mpq/unit/terran/eidolon-remains.grp differ diff --git a/mpq/unit/terran/eidolon-shadow.grp b/mpq/unit/terran/eidolon-shadow.grp new file mode 100644 index 00000000..58920c33 Binary files /dev/null and b/mpq/unit/terran/eidolon-shadow.grp differ diff --git a/mpq/unit/terran/eidolon.grp b/mpq/unit/terran/eidolon.grp new file mode 100644 index 00000000..8e3784f4 Binary files /dev/null and b/mpq/unit/terran/eidolon.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index da289930..811d2c25 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 0d3c0bd9..eb34ec2b 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/mpq/unit/zerg/hydralisk-shadow.grp b/mpq/unit/zerg/hydralisk-shadow.grp index 905194cf..2bc8bd48 100644 Binary files a/mpq/unit/zerg/hydralisk-shadow.grp and b/mpq/unit/zerg/hydralisk-shadow.grp differ diff --git a/mpq/unit/zerg/hydralisk.grp b/mpq/unit/zerg/hydralisk.grp index a3637897..3b525c61 100644 Binary files a/mpq/unit/zerg/hydralisk.grp and b/mpq/unit/zerg/hydralisk.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 64e242c3..2c8df417 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ