diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 47f57172..1b40e364 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 7ee5af2d..6534c80b 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 ea0f764c..afe5db41 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1,8 +1,8 @@ -Skryling -Skryling Shadow -Skryling Birth -Skryling Death -Skryling Explosion +Skryrokor +Skryrokor Shadow +Skryrokor Birth +Skryrokor Death +Skryrokor Explosion Rilirokor Rilirokor Shadow Rilirokor Remains @@ -2089,7 +2089,7 @@ Power Siphon Hit (Medium) Power Siphon Hit (Large) Askosi Death Explosion Small Askosi Death Explosion Large -Extended Image #1089 +Wraith Death Explosion Extended Image #1090 Extended Image #1091 Extended Image #1092 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 30154660..f5efff3c 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index b33f9f64..1044a0ba 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 4fa0f75b..07249a65 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index bbd4816c..b628f476 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 8efc4f5f..46fe8102 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -1374,6 +1374,7 @@ WraithGndAttkToIdle: WraithDeath: playsnd 257 # Terran\PHOENIX\TPhDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) +# imgol 2091 0 0 # Wraith Death Explosion (cm\terran\wraith-death.grp) wait 3 lowsprul 822 0 42 # Wraith Remains (cm\terran\wraith-remains.grp) end @@ -19303,4 +19304,29 @@ PowerSiphonInit: wait 1 playfram 2 goto Generic_Wait1End - \ No newline at end of file + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2091 Wraith Death (cm\terran\wraith-death.grp) +.headerstart +IsId 832 +Type 0 +Init WraithDeathInit +Death [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +WraithDeathInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + end \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index aeec9b91..03771c2e 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 6245bca3..390c953e 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -3449,6 +3449,7 @@ SurkithCesiantGndAttkInit: trgtarccondjmp 74 42 SurkithCesiantLocal00 trgtarccondjmp 159 42 SurkithCesiantLocal01 nobrkcodestart + wait 1 playfram 24 wait 1 playfram 25 @@ -3482,11 +3483,11 @@ SurkithCesiantGndAttkInit: playfram 25 wait 1 playfram 24 - wait 1 nobrkcodeend gotorepeatattk ignorerest SurkithCesiantGndAttkToIdle: + wait 1 goto SurkithCesiantIsWorking SurkithCesiantIsWorking: @@ -3500,6 +3501,7 @@ SurkithCesiantIsWorking: SurkithCesiantLocal00: nobrkcodestart + wait 1 playfram 4 wait 1 playfram 5 @@ -3543,6 +3545,7 @@ SurkithCesiantLocal00: SurkithCesiantLocal01: nobrkcodestart + wait 1 playfram 14 wait 1 playfram 15 @@ -7490,6 +7493,7 @@ SkortrithCesiantGndAttkInit: trgtarccondjmp 74 42 SkortrithCesiantLocal00 trgtarccondjmp 159 42 SkortrithCesiantLocal01 nobrkcodestart + wait 1 playfram 24 wait 1 playfram 25 @@ -7523,7 +7527,6 @@ SkortrithCesiantGndAttkInit: playfram 25 wait 1 playfram 24 - wait 1 nobrkcodeend gotorepeatattk ignorerest @@ -7531,6 +7534,7 @@ SkortrithCesiantGndAttkInit: SkortrithCesiantLocal00: nobrkcodestart + wait 1 playfram 4 wait 1 playfram 5 @@ -7574,6 +7578,7 @@ SkortrithCesiantLocal00: SkortrithCesiantLocal01: nobrkcodestart + wait 1 playfram 14 wait 1 playfram 15 diff --git a/mpq/unit/cm/terran/wraith-death.grp b/mpq/unit/cm/terran/wraith-death.grp new file mode 100644 index 00000000..53f8e730 Binary files /dev/null and b/mpq/unit/cm/terran/wraith-death.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 9a0f5a94..a94cf8db 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 019edb80..7a3170c3 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index f9cd5890..2fd7cdee 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -10,12 +10,18 @@ ## Audiovisuals - New portrait for: - **Izirokor** (c. Solstice) +- New wireframe for: + - **Izirokor** (c. jun3hong) - New icons for: (c. Raenarill) - **Burst Lasers** (Wraith) - **Perpetual Wind** (Axitrilisk), **Reconstitution** (Vilgorokor), Screaming Venom (Keskathalor) ## Bugfixes - **Stability:** + - Prospective fix for a Zerg AI freeze (r. Solstice & others). - Fixed rare crash when **Cohort**s self-revive at the unit limit (r. sharktemplar) + - Fixed rare crash when **Matraleth**-spawned **Vilgoleth**s were attempted to be made at the unit limit - **Audiovisual:** - - Fixed wonky birth and mutation animations for the Izirokor (c. Solstice) \ No newline at end of file + - Fixed wonky birth and mutation animations for the Izirokor (c. Solstice) + - Added **Miasma** passive icons & tooltips to **Kagralisk** and **Cherbrathalor** (r. Raenarill) + - Added **Brontes Payload** icon to **Futurist Cyclops** (r. Raenarill) \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8c7c7878..96b281c0 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ