diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 01c49640..7d435e78 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 4b61dfda..e92da26c 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 c985447d..099dc80d 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1779,7 +1779,7 @@ Hotshot Shadow Ocsal Regression Overlay Tyranny Overlay Nathrok Lake -Extended Image #779 +Mortothrokor Birth Skithrok Scab Extended Image #781 Extended Image #782 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 7dbc15b8..3d5f2e65 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index d3214d93..88eb088a 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 585105f3..cdce1571 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -50703,29 +50703,33 @@ MortothrokorUnused1: goto MortothrokorGndAttkToIdle MortothrokorGndAttkInit: - playfram 0x55 + playfram 0x00 MortothrokorGndAttkRpt: wait 1 nobrkcodestart playsndrand 3 891 892 893 # Zerg\Ultra\zulAtt00.WAV | Zerg\Ultra\zulAtt01.WAV | Zerg\Ultra\zulAtt02.WAV wait 1 - playfram 0x66 + playfram 0xBB wait 1 - playfram 0x77 + playfram 0xCC attackwith 1 playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV - wait 2 - playfram 0x66 - wait 2 - playfram 0x77 + wait 1 + playfram 0xDD + wait 1 + playfram 0xEE attackwith 1 playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 1 - playfram 0x66 + playfram 0xFF wait 1 - playfram 0x88 + playfram 0x110 wait 1 - playfram 0x99 + playfram 0x121 + wait 1 + playfram 0x132 + wait 1 + playfram 0x143 wait 1 nobrkcodeend gotorepeatattk @@ -50736,26 +50740,31 @@ MortothrokorWalking: playfram 0x11 wait 1 move 4 - wait 1 - move 4 playfram 0x22 wait 1 move 4 - wait 1 - move 4 playfram 0x33 wait 1 move 4 - wait 1 - move 4 playfram 0x44 wait 1 move 4 + playfram 0x55 wait 1 move 4 - playfram 0x22 + playfram 0x66 wait 1 move 4 + playfram 0x77 + wait 1 + move 4 + playfram 0x88 + wait 1 + move 4 + playfram 0x99 + wait 1 + move 4 + playfram 0xAA wait 1 goto MortothrokorWalking @@ -50764,44 +50773,57 @@ MortothrokorSpecialState2: 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 + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x165 + wait 1 + playfram 0x176 + wait 1 + playfram 0x187 + wait 1 + playfram 0x198 + wait 1 + playfram 0x1A9 + wait 1 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x1C0 + wait 1 + playfram 0x1DA + wait 1 + playfram 0x1EB + wait 1 + playfram 0x1FC + wait 1 + playfram 0x20D + wait 1 + playfram 0x21E + wait 1 + playfram 0x22F + wait 1 + playfram 0x240 + 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 + wait 1 + waitrand 1 2 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x22F + wait 1 + playfram 0x20D + wait 1 + playfram 0x1DA + wait 1 + playfram 0x185 + wait 1 + playfram 0x176 + wait 1 + playfram 0x165 + wait 1 + sigorder 4 + goto MortothrokorGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/zerg/mortothrokor-birth.grp b/mpq/unit/cm/zerg/mortothrokor-birth.grp new file mode 100644 index 00000000..c7cff63f Binary files /dev/null and b/mpq/unit/cm/zerg/mortothrokor-birth.grp differ diff --git a/mpq/unit/cm/zerg/mortothrokor-shadow.grp b/mpq/unit/cm/zerg/mortothrokor-shadow.grp index 8b1844a2..85eaf147 100644 Binary files a/mpq/unit/cm/zerg/mortothrokor-shadow.grp and b/mpq/unit/cm/zerg/mortothrokor-shadow.grp differ diff --git a/mpq/unit/cm/zerg/mortothrokor.grp b/mpq/unit/cm/zerg/mortothrokor.grp index a997d224..703232de 100644 Binary files a/mpq/unit/cm/zerg/mortothrokor.grp and b/mpq/unit/cm/zerg/mortothrokor.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index efd0fbe8..cf4e1300 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 48e4a89e..e0a81249 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index 39827b98..1e886132 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -18,7 +18,7 @@ Patch goals include: - [Pr0totype #34 - The Heights of Competition](https://youtu.be/iqCUmPU4Vg4) - [Pr0totype #35 - Hanging in the Balance...](https://youtu.be/_ow8h03x6FE) - [Pr0totype #36 - And Then, We Ascended.](https://youtu.be/Z5a3upLGIds) -- [Pr0totype #37 - ]() +- [Pr0totype #37 - A Very Merry Crowmas!](https://youtu.be/5XyhFuwOUus) ## Patch summary @@ -100,6 +100,8 @@ Patch goals include: - Sunblot 3 - Skittering Duo ## Audiovisuals +- New sprite for: + - Mortothrokor (c. Solstice) - Updated weapon SFX for: - Sentinel (weapon fire) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index ab404cc0..c7297a71 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ