diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index c8c6abc5..147ed97e 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 e000e9aa..7a1a2895 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 a865fe57..62f8094c 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1263,7 +1263,7 @@ Keskathalor Spores Keskathalor Weaponhit Burst Lasers Explosive Burst Lasers Impact Damageless -Lazarus Agent Cast +Lazarus Agent Cast (unused) Lazarus Agent Revive Sublime Shepherd Overlay Clarion @@ -1888,13 +1888,13 @@ Sasyrvoleth Birth Protathalor Mutate Izirokor Mutate Skithrokor Mutate -Extended Image #888 -Extended Image #889 -Extended Image #890 -Extended Image #891 -Extended Image #892 -Extended Image #893 -Extended Image #894 +Blade Vortex Debuff XLarge +Lazarus Agent Proc Small +Lazarus Agent Proc Medium +Lazarus Agent Proc Large +Lazarus Agent Proc XLarge +Geszithalor Mutate +Evigrilisk Mutate Extended Image #895 Extended Image #896 Extended Image #897 diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 9b2d25b5..56453850 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -31853,7 +31853,7 @@ LazarusAgentCastDeath: IsId 536 Type 1 Init LazarusAgentReviveInit -Death LazarusAgentReviveDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -31861,45 +31861,25 @@ LazarusAgentReviveInit: playfram 0x00 wait 1 LazarusAgentReviveLocal00: - playfram 1 - wait 1 - playfram 3 + playfram 2 wait 1 playfram 4 wait 1 - playfram 5 - wait 1 playfram 6 wait 1 - playfram 7 - wait 1 playfram 8 wait 1 - playfram 9 - wait 1 playfram 10 wait 1 - playfram 11 - wait 1 playfram 12 - wait 1 - playfram 13 - wait 1 + wait 1 playfram 14 wait 1 - playfram 15 - wait 1 playfram 16 wait 1 - playfram 17 - wait 1 playfram 18 wait 1 - goto LazarusAgentReviveDeath - -LazarusAgentReviveDeath: - wait 1 - end + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51198,13 +51178,7 @@ MuzzleFlashSingleInit: playfram 0x00 wait 1 end - # ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1856 Avenge Small (cm\protoss\avenge-small.grp) -# 1857 Avenge Medium (cm\protoss\avenge-medium.grp) -# 1858 Avenge Large (cm\protoss\avenge-large.grp) -# 1859 Avenge XLarge (cm\protoss\avenge-xlarge.grp) # 1860 Ascension Small (cm\protoss\ascension-small.grp) # 1861 Ascension Medium (cm\protoss\ascension-medium.grp) # 1862 Ascension Large (cm\protoss\ascension-large.grp) @@ -51213,7 +51187,7 @@ MuzzleFlashSingleInit: IsId 781 Type 1 Init AscensionProcInit -Death Generic_Wait1End +Death AscensionProcDeath .headerend # ----------------------------------------------------------------------------- # @@ -51234,6 +51208,7 @@ AscensionProcInit: wait 1 playfram 7 wait 1 +AscensionProcLoop: playfram 8 wait 1 playfram 9 @@ -51245,7 +51220,58 @@ AscensionProcInit: playfram 12 wait 1 playfram 13 - goto Generic_Wait1End + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 17 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + playfram 21 + wait 1 + playfram 22 + wait 1 + playfram 23 + wait 1 + playfram 24 + wait 1 + playfram 25 + wait 1 + playfram 26 + wait 1 + goto AscensionProcLoop +AscensionProcDeath: + playfram 40 + wait 1 + playfram 41 + wait 1 + playfram 42 + wait 1 + playfram 43 + wait 1 + playfram 44 + wait 1 + playfram 45 + wait 1 + playfram 46 + wait 1 + playfram 47 + wait 1 + playfram 48 + wait 1 + playfram 49 + wait 1 + playfram 50 + wait 1 + end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51755,4 +51781,188 @@ SasyrvolethWalking: wait 1 goto SasyrvolethWalking -## Next free IsId: 790 \ No newline at end of file + + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1856 Avenge Small (cm\protoss\avenge-small.grp) +# 1857 Avenge Medium (cm\protoss\avenge-medium.grp) +# 1858 Avenge Large (cm\protoss\avenge-large.grp) +# 1859 Avenge XLarge (cm\protoss\avenge-xlarge.grp) +.headerstart +IsId 790 +Type 1 +Init AvengeProcInit +Death AvengeProcDeath +.headerend +# ----------------------------------------------------------------------------- # + +AvengeProcInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 +AvengeProcLoop: + playfram 34 + wait 1 + playfram 35 + wait 1 + playfram 36 + wait 1 + playfram 37 + wait 1 + playfram 38 + wait 1 + playfram 39 + wait 1 + playfram 40 + wait 1 + playfram 41 + wait 1 + playfram 42 + wait 1 + playfram 43 + wait 1 + playfram 44 + wait 1 + playfram 45 + wait 1 + playfram 46 + wait 1 + playfram 47 + wait 1 + playfram 48 + wait 1 + playfram 49 + wait 1 + playfram 50 + wait 1 + playfram 51 + wait 1 + playfram 52 + wait 1 + playfram 53 + wait 1 + playfram 54 + wait 1 + playfram 55 + wait 1 + playfram 56 + wait 1 + playfram 57 + wait 1 + playfram 58 + wait 1 + playfram 59 + wait 1 + playfram 60 + wait 1 + playfram 61 + wait 1 + playfram 62 + wait 1 + playfram 63 + wait 1 + playfram 64 + wait 1 + playfram 65 + wait 1 + playfram 66 + wait 1 + playfram 67 + wait 1 + playfram 68 + wait 1 + playfram 69 + wait 1 + playfram 70 + wait 1 + playfram 71 + wait 1 + playfram 72 + wait 1 + playfram 73 + wait 1 + playfram 74 + wait 1 + playfram 75 + wait 1 + playfram 76 + wait 1 + playfram 77 + wait 1 + playfram 78 + wait 1 + playfram 79 + wait 1 + playfram 80 + wait 1 + playfram 81 + wait 1 + playfram 82 + wait 1 + playfram 83 + wait 1 + playfram 84 + wait 1 + playfram 85 + wait 1 + playfram 86 + wait 1 + playfram 87 + wait 1 + playfram 88 + wait 1 + playfram 89 + wait 1 + playfram 90 + wait 1 + playfram 91 + wait 1 + playfram 92 + wait 1 + playfram 93 + wait 1 + playfram 94 + goto AvengeProcLoop + +AvengeProcDeath: + playfram 95 + wait 1 + playfram 97 + wait 1 + playfram 99 + wait 1 + playfram 101 + wait 1 + playfram 102 + wait 1 + playfram 103 + wait 1 + end + +## Next free IsId: 791 \ No newline at end of file diff --git a/mpq/unit/cm/protoss/ascension-large.grp b/mpq/unit/cm/protoss/ascension-large.grp index 97db1534..ef3707da 100644 Binary files a/mpq/unit/cm/protoss/ascension-large.grp and b/mpq/unit/cm/protoss/ascension-large.grp differ diff --git a/mpq/unit/cm/protoss/ascension-medium.grp b/mpq/unit/cm/protoss/ascension-medium.grp index 92f57010..0879d6f7 100644 Binary files a/mpq/unit/cm/protoss/ascension-medium.grp and b/mpq/unit/cm/protoss/ascension-medium.grp differ diff --git a/mpq/unit/cm/protoss/ascension-small.grp b/mpq/unit/cm/protoss/ascension-small.grp index 11253584..76181f0e 100644 Binary files a/mpq/unit/cm/protoss/ascension-small.grp and b/mpq/unit/cm/protoss/ascension-small.grp differ diff --git a/mpq/unit/cm/protoss/ascension-xlarge.grp b/mpq/unit/cm/protoss/ascension-xlarge.grp index 7448c4bd..a5fb912f 100644 Binary files a/mpq/unit/cm/protoss/ascension-xlarge.grp and b/mpq/unit/cm/protoss/ascension-xlarge.grp differ diff --git a/mpq/unit/cm/protoss/avenge-large.grp b/mpq/unit/cm/protoss/avenge-large.grp index e1072feb..118768f8 100644 Binary files a/mpq/unit/cm/protoss/avenge-large.grp and b/mpq/unit/cm/protoss/avenge-large.grp differ diff --git a/mpq/unit/cm/protoss/avenge-medium.grp b/mpq/unit/cm/protoss/avenge-medium.grp index 93489ba3..6d4d7885 100644 Binary files a/mpq/unit/cm/protoss/avenge-medium.grp and b/mpq/unit/cm/protoss/avenge-medium.grp differ diff --git a/mpq/unit/cm/protoss/avenge-small.grp b/mpq/unit/cm/protoss/avenge-small.grp index 1faf615d..c5ca595f 100644 Binary files a/mpq/unit/cm/protoss/avenge-small.grp and b/mpq/unit/cm/protoss/avenge-small.grp differ diff --git a/mpq/unit/cm/protoss/avenge-xlarge.grp b/mpq/unit/cm/protoss/avenge-xlarge.grp index 4304bf7a..0dfcb200 100644 Binary files a/mpq/unit/cm/protoss/avenge-xlarge.grp and b/mpq/unit/cm/protoss/avenge-xlarge.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire-blade-vortex-L.grp b/mpq/unit/cm/protoss/legionnaire-blade-vortex-L.grp index e75e2afc..ea7d74d9 100644 Binary files a/mpq/unit/cm/protoss/legionnaire-blade-vortex-L.grp and b/mpq/unit/cm/protoss/legionnaire-blade-vortex-L.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire-blade-vortex-M.grp b/mpq/unit/cm/protoss/legionnaire-blade-vortex-M.grp index d29706be..9587f607 100644 Binary files a/mpq/unit/cm/protoss/legionnaire-blade-vortex-M.grp and b/mpq/unit/cm/protoss/legionnaire-blade-vortex-M.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire-blade-vortex-S.grp b/mpq/unit/cm/protoss/legionnaire-blade-vortex-S.grp index 9587f607..620ca01f 100644 Binary files a/mpq/unit/cm/protoss/legionnaire-blade-vortex-S.grp and b/mpq/unit/cm/protoss/legionnaire-blade-vortex-S.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire-blade-vortex-XL.grp b/mpq/unit/cm/protoss/legionnaire-blade-vortex-XL.grp new file mode 100644 index 00000000..e75e2afc Binary files /dev/null and b/mpq/unit/cm/protoss/legionnaire-blade-vortex-XL.grp differ diff --git a/mpq/unit/cm/effect/lazarusagent-cast.grp b/mpq/unit/cm/terran/lazarus-proc-L.grp similarity index 100% rename from mpq/unit/cm/effect/lazarusagent-cast.grp rename to mpq/unit/cm/terran/lazarus-proc-L.grp diff --git a/mpq/unit/cm/terran/lazarus-proc-M.grp b/mpq/unit/cm/terran/lazarus-proc-M.grp new file mode 100644 index 00000000..a9c408c0 Binary files /dev/null and b/mpq/unit/cm/terran/lazarus-proc-M.grp differ diff --git a/mpq/unit/cm/terran/lazarus-proc-S.grp b/mpq/unit/cm/terran/lazarus-proc-S.grp new file mode 100644 index 00000000..3812d24e Binary files /dev/null and b/mpq/unit/cm/terran/lazarus-proc-S.grp differ diff --git a/mpq/unit/cm/terran/lazarus-proc-XL.grp b/mpq/unit/cm/terran/lazarus-proc-XL.grp new file mode 100644 index 00000000..7d1acae0 Binary files /dev/null and b/mpq/unit/cm/terran/lazarus-proc-XL.grp differ diff --git a/mpq/unit/cm/zerg/evigrilisk-mutate.grp b/mpq/unit/cm/zerg/evigrilisk-mutate.grp new file mode 100644 index 00000000..46820128 Binary files /dev/null and b/mpq/unit/cm/zerg/evigrilisk-mutate.grp differ diff --git a/mpq/unit/cm/zerg/geszithalor-mutate.grp b/mpq/unit/cm/zerg/geszithalor-mutate.grp new file mode 100644 index 00000000..34bda118 Binary files /dev/null and b/mpq/unit/cm/zerg/geszithalor-mutate.grp differ diff --git a/patchnotes.md b/patchnotes.md index 4fbca8e3..9ed2ace1 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -13,6 +13,8 @@ Forthcoming. ## Internals - **Console:** - Added "duplicate" command (`unit duplicate` or `u d`) (with help from benno) +- **Logging:** + - Updated random logging to include the frame the randomizer function was called ## Bugfixes - **Stability**: @@ -27,7 +29,12 @@ Forthcoming. ## Audiovisuals - Added birth animation for Sasyrvoleth - Added morph animations for: - - Protathalor, Izirokor, Skithrokor + - Protathalor, Izirokor, Skithrokor, Evigrilisk, Geszithalor +- Updated effects for: + - Reclamation proc & heal + - Vengeful Ascension + - Legionnaire Blade Vortex + - Zerg corpse consumption ## Terran - **Reclamation**: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fc25bf6e..0755f35b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ