diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index 01de59a3..f53a0580 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 63c99b7c..b0b9cbae 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 72dd97bd..3eb8334e 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 d31e7c50..33b8059f 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1829,7 +1829,7 @@ Kalkalisk Birth (Egg) Tethzorokor Birth Vilgorokor Birth Protathalor Birth -Extended Image #829 +Cikralisk Birth Extended Image #830 Extended Image #831 Extended Image #832 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index dc25ce08..efd7ec77 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 555dce27..5d0c65cc 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3025,9 +3025,9 @@ Addon Construction 01 Addon Construction 02 Addon Construction 03 Addon Construction 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Cikralisk Weaponfire 01 +Cikralisk Weaponfire 02 +Cikralisk Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 72e30d11..834fe37e 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3024,4 +3024,7 @@ cm\t\madcap\pas-03.wav cm\t\_building\_construct-01.wav cm\t\_building\_construct-02.wav cm\t\_building\_construct-03.wav -cm\t\_building\_construct-04.wav \ No newline at end of file +cm\t\_building\_construct-04.wav +cm\z\cikralisk\wf-01.wav +cm\z\cikralisk\wf-02.wav +cm\z\cikralisk\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index dff4c7f1..185b62b5 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 8b05cba4..4d9e38ea 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 516898aa..c15e94d0 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -39422,22 +39422,8 @@ AxitriliskInit: imgul 1414 0 -5 # Axitrilisk Shadow (cm\zerg\axitrilisk-shadow.grp) AxitriliskWalkingToIdle: playfram 0x00 - wait 62 - randcondjmp 64 AxitriliskLocal00 + wait 125 goto AxitriliskWalkingToIdle -AxitriliskLocal00: - wait 1 - playfram 0x20 - wait 1 - playfram 0x40 - wait 1 - playfram 0x60 - wait 1 - playfram 0x40 - wait 1 - playfram 0x20 - wait 1 - goto AxitriliskWalkingToIdle AxitriliskDeath: playsnd 1536 # Skithrokor death 01 @@ -46284,12 +46270,12 @@ AirAttkInit CikraliskGndAttkInit Unused1 CikraliskUnused1 GndAttkRpt CikraliskGndAttkInit AirAttkRpt CikraliskGndAttkInit -CastSpell CikraliskCastSpell +CastSpell [NONE] GndAttkToIdle CikraliskGndAttkToIdle AirAttkToIdle CikraliskGndAttkToIdle Unused2 [NONE] Walking CikraliskWalking -WalkingToIdle CikraliskWalkingToIdle +WalkingToIdle CikraliskGndAttkToIdle SpecialState1 [NONE] SpecialState2 CikraliskSpecialState2 AlmostBuilt [NONE] @@ -46310,77 +46296,11 @@ Enable [NONE] CikraliskInit: imgul 1394 0 0 # Cikralisk Shadow (cm\zerg\cikralisk-shadow.grp) - goto CikraliskLocal42 -CikraliskLocal42: - playfram 0x00 - wait 1 - goto CikraliskLocal00 - -CikraliskLocal00: - wait 62 - randcondjmp 25 CikraliskLocal01 - randcondjmp 128 CikraliskLocal02 - goto CikraliskLocal00 - -CikraliskLocal01: - playfram 0x120 - wait 1 - playfram 0x140 - wait 1 - playfram 0x160 - wait 1 - playfram 0x180 - wait 12 - playfram 0x160 - wait 1 - playfram 0x140 - wait 1 - playfram 0x120 - wait 1 - goto CikraliskLocal42 - -CikraliskLocal02: - randcondjmp 128 CikraliskLocal03 - playfram 0x20 - wait 1 - turnccwise 1 - playfram 0x40 - wait 1 - turnccwise 1 - playfram 0x60 - wait 1 - turnccwise 1 - playfram 0x40 - wait 1 - turnccwise 1 - playfram 0x20 - wait 1 - turnccwise 1 - playfram 0x00 - wait 1 - turnccwise 1 - goto CikraliskLocal42 - -CikraliskLocal03: - playfram 0x20 - wait 1 - turncwise 1 - playfram 0x40 - wait 1 - turncwise 1 - playfram 0x60 - wait 1 - turncwise 1 - playfram 0x40 - wait 1 - turncwise 1 - playfram 0x20 - wait 1 - turncwise 1 - playfram 0x00 - wait 1 - turncwise 1 - goto CikraliskLocal42 + goto CikraliskGndAttkToIdle +CikraliskGndAttkToIdle: + playfram 0x00 + wait 1 + goto CikraliskGndAttkToIdle CikraliskDeath: playsnd 867 # Zerg\Hydra\ZHyDth00.WAV @@ -46408,7 +46328,7 @@ CikraliskUnused1: wait 2 setfldirect 12 nobrkcodeend - goto CikraliskLocal42 + goto CikraliskGndAttkToIdle CikraliskGndAttkInit: playfram 0x120 @@ -46420,7 +46340,7 @@ CikraliskGndAttkInit: attackwith 1 wait 1 playfram 0x180 - playsnd 1894 # Kagralisk weaponfire 01 + playsndbtwn 3027 3029 # Cikralisk weaponfire 01, 02, 03 attackwith 1 wait 1 nobrkcodeend @@ -46433,36 +46353,6 @@ CikraliskGndAttkInit: gotorepeatattk ignorerest goto CikraliskGndAttkToIdle - -CikraliskGndAttkToIdle: - playfram 0x00 - wait 1 - goto CikraliskLocal00 - -CikraliskCastSpell: - playfram 0x120 - wait 1 - nobrkcodestart - playfram 0x140 - wait 1 - playfram 0x160 - attackwith 1 - wait 1 - playfram 0x180 - playsnd 1894 # Kagralisk weaponfire 01 - castspell - sigorder 2 - wait 1 - nobrkcodeend - playfram 0x160 - wait 1 - playfram 0x140 - wait 1 - playfram 0x120 - wait 1 - gotorepeatattk - ignorerest - goto CikraliskGndAttkToIdle CikraliskWalking: move 5 @@ -46491,10 +46381,6 @@ CikraliskWalking: move 5 wait 1 goto CikraliskWalking - -CikraliskWalkingToIdle: - playfram 0x00 - goto CikraliskLocal00 CikraliskSpecialState2: playfram 0x1A0 @@ -46532,7 +46418,7 @@ CikraliskUnBurrow: playfram 0x20 wait 1 sigorder 4 - goto CikraliskWalkingToIdle + goto CikraliskGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -50614,7 +50500,7 @@ MortothrokorBurrow: playfram 0x240 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto MortothrokorSpecialState2 MortothrokorUnBurrow: wait 1 @@ -52068,7 +51954,7 @@ Unused2 [NONE] Walking CherbrathalorWalking WalkingToIdle CherbrathalorGndAttkToIdle SpecialState1 [NONE] -SpecialState2 ZoryusthalethSpecialState2 +SpecialState2 CherbrathalorSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -52079,8 +51965,8 @@ WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] Disable [NONE] -Burrow ZoryusthalethBurrow -UnBurrow ZoryusthalethUnBurrow +Burrow CherbrathalorBurrow +UnBurrow CherbrathalorUnBurrow .headerend # ----------------------------------------------------------------------------- # @@ -52183,6 +52069,55 @@ CherbrathalorWalking: move 3 playfram 0x00 goto CherbrathalorWalking + +CherbrathalorBurrow: + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 1 + sigorder 4 + goto CherbrathalorSpecialState2 + +CherbrathalorUnBurrow: + wait 1 + waitrand 1 2 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0xC0 + wait 1 + playfram 0xA0 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + sigorder 4 + goto CherbrathalorGndAttkToIdle + +CherbrathalorSpecialState2: + playfram 0x280 + goto ZoryusthalethLocal07 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52204,7 +52139,7 @@ Unused2 [NONE] Walking CherbrathalorWalking WalkingToIdle OkrimniliskGndAttkToIdle SpecialState1 [NONE] -SpecialState2 ZoryusthalethSpecialState2 +SpecialState2 OkrimniliskSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -52215,8 +52150,8 @@ WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] Disable [NONE] -Burrow ZoryusthalethBurrow -UnBurrow ZoryusthalethUnBurrow +Burrow OkrimniliskBurrow +UnBurrow OkrimniliskUnBurrow .headerend # ----------------------------------------------------------------------------- # @@ -52308,8 +52243,55 @@ OkrimniliskGndAttkInit: gotorepeatattk ignorerest goto OkrimniliskGndAttkToIdle - +OkrimniliskBurrow: + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 1 + sigorder 4 + goto OkrimniliskSpecialState2 + +OkrimniliskUnBurrow: + wait 1 + waitrand 1 2 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0xC0 + wait 1 + playfram 0xA0 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + sigorder 4 + goto OkrimniliskGndAttkToIdle + +OkrimniliskSpecialState2: + playfram 0x140 + goto ZoryusthalethLocal07 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/sound/cm/z/cikralisk/wf-01.wav b/mpq/sound/cm/z/cikralisk/wf-01.wav new file mode 100644 index 00000000..3321312c Binary files /dev/null and b/mpq/sound/cm/z/cikralisk/wf-01.wav differ diff --git a/mpq/sound/cm/z/cikralisk/wf-02.wav b/mpq/sound/cm/z/cikralisk/wf-02.wav new file mode 100644 index 00000000..a4c09845 Binary files /dev/null and b/mpq/sound/cm/z/cikralisk/wf-02.wav differ diff --git a/mpq/sound/cm/z/cikralisk/wf-03.wav b/mpq/sound/cm/z/cikralisk/wf-03.wav new file mode 100644 index 00000000..dff73795 Binary files /dev/null and b/mpq/sound/cm/z/cikralisk/wf-03.wav differ diff --git a/mpq/unit/cm/zerg/cherbrathalor.grp b/mpq/unit/cm/zerg/cherbrathalor.grp index 848afc43..97c411e4 100644 Binary files a/mpq/unit/cm/zerg/cherbrathalor.grp and b/mpq/unit/cm/zerg/cherbrathalor.grp differ diff --git a/mpq/unit/cm/zerg/cikralisk-birth.grp b/mpq/unit/cm/zerg/cikralisk-birth.grp new file mode 100644 index 00000000..0c736213 Binary files /dev/null and b/mpq/unit/cm/zerg/cikralisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/evigrilisk-birth.grp b/mpq/unit/cm/zerg/evigrilisk-birth.grp index b7f385a3..81a73b1c 100644 Binary files a/mpq/unit/cm/zerg/evigrilisk-birth.grp and b/mpq/unit/cm/zerg/evigrilisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/okrimnilisk.grp b/mpq/unit/cm/zerg/okrimnilisk.grp index 0059e37e..49133c08 100644 Binary files a/mpq/unit/cm/zerg/okrimnilisk.grp and b/mpq/unit/cm/zerg/okrimnilisk.grp differ diff --git a/patchnotes.md b/patchnotes.md index bdc5380c..c935c03e 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -21,6 +21,7 @@ This patch will include audiovisual improvements and mild balance adjustments. - Gameplay: - Removed detector flag from Axtoth Axis (r. TheBeaver99) - Audiovisual: + - Savants now correctly play their weaponfire SFX when attacking while garrisoned - Losing a structure with an addon still attached no longer plays the "abandon addon" advisor event (r. TheBeaver99) - Fixed advisor events not playing for structure warp completion if your race was not Protoss, and addon completion if your race was not Terran (r. TheBeaver99) - Corrected Vagrant Shade portrait (r. TheBeaver99) @@ -35,6 +36,7 @@ This patch will include audiovisual improvements and mild balance adjustments. - Added SFX for: - Terran addon self-construction - Madcaps reaching full stacks of Cabeirus Feeders + - Cikralisk weaponfire - Updated icons for: - Terran supreme construction; All Protoss constructions (c. TheBeaver99) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fdc93a48..350f9d01 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ