diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index fecfe2fe..be396463 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 65b8bd11..689aa50f 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 4e427129..82b9390e 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2250,7 +2250,7 @@ Ogroszaleth Birth Malkothrokor Malkothrokor Shadow Malkothrokor Remnants -Extended Image #1250 +Malkothrokor Birth Extended Image #1251 Extended Image #1252 Extended Image #1253 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 9f46d49b..ce46b3d5 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 68d8f8dc..cc7dd9c3 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4143,15 +4143,15 @@ Askosi Rescue 01 Landlock Selected 01 Function Selected 01 Cosmoscope Selected 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Askosi Explosion Medium 01 +Askosi Explosion Medium 02 +Askosi Explosion Medium 03 +Askosi Explosion Large 01 +Askosi Explosion Large 02 +Askosi Explosion Large 03 +Blackguard Weaponhit 01 +Blackguard Weaponhit 02 +Blackguard Weaponhit 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 16e09434..e30dcd4e 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4142,4 +4142,13 @@ cm\a\a-construction-end-01.wav cm\a\a-rescue-01.wav cm\a\_building\landlock-wht-01.wav cm\a\_building\function-wht-01.wav -cm\a\_building\cosmoscope-wht-01.wav \ No newline at end of file +cm\a\_building\cosmoscope-wht-01.wav +cm\a\a-explosion-medium-01.wav +cm\a\a-explosion-medium-02.wav +cm\a\a-explosion-medium-03.wav +cm\a\a-explosion-large-01.wav +cm\a\a-explosion-large-02.wav +cm\a\a-explosion-large-03.wav +cm\f-t\blackguard\wh-01.wav +cm\f-t\blackguard\wh-02.wav +cm\f-t\blackguard\wh-03.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index aeb661e4..413d4b1d 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 ce21c773..353da560 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -547,7 +547,7 @@ Askosi Zylode Askosi Astrolabe Terran Serathiel (Hecaton) Zerg Malkothrokor -Buttonset Cesiant Mutations +unused Askosi Panoply Extended Unit #324 Extended Unit #325 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 90d5195a..41dff7e4 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 86aad6f9..a34dd686 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 86cf0cb3..305d0007 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -1029,7 +1029,7 @@ Adaptive Amitosis: Must be burrowed.<0> <0> <0> <0> -Hive Tissues:<10> Must not have hive tissue.<0> +Hive Tissues:<10> Must not have a hive tissue.<0> Intestinal Infinity:<10> Must be burrowed.<0> c<0><4>Hive Tissues <1>(<3>C<1>)<0> Gestating...<0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index c8c6b298..f00a5aa8 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index 02f30ac9..93f2612a 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -36,7 +36,7 @@ LandlockWorkingToIdle: goto SkryrokorLocal00 LandlockDeath: - playsnd 7 # Misc\ExploLrg.wav + playsndbtwn 4148 4150 # Askosi explosion large 01, 02, 03 imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) @@ -493,7 +493,7 @@ ChantryInit: goto ChantryIsWorking ChantryDeath: - playsnd 7 # Misc\ExploLrg.wav + playsndbtwn 4145 4147 # Askosi explosion medium 01, 02, 03 imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\askosi\a-rubble-small.grp) @@ -2021,7 +2021,7 @@ MimicWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# xxxx Intendent (cm\askosi\intendent.grp) +# 4026 Intendent (cm\askosi\intendent.grp) .headerstart IsId 23 Type 21 @@ -2350,7 +2350,7 @@ AbutmentLocal00: goto AbutmentLocal00 AbutmentDeath: - playsnd 7 # Misc\ExploLrg.wav + playsndbtwn 4145 4147 # Askosi explosion medium 01, 02, 03 sprol 272 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 end diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 6104bd92..08011fa2 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 af768870..843823d2 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -17757,7 +17757,7 @@ MalkothrokorWalking: goto MalkothrokorWalking MalkothrokorSpecialState2: - playfram 0x187 + playfram 0x22d goto SkryrokorLocal00 MalkothrokorBurrow: @@ -17784,7 +17784,7 @@ MalkothrokorBurrow: wait 1 playfram 0x176 wait 1 - playfram 0x187 + playfram 0x22d imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) imgol 423 9 15 # Burrowing Dust (thingy\bDust.grp) imgol 423 -15 21 # Burrowing Dust (thingy\bDust.grp) diff --git a/mpq/sound/cm/a/a-explosion-large-01.wav b/mpq/sound/cm/a/a-explosion-large-01.wav new file mode 100644 index 00000000..a026cea5 Binary files /dev/null and b/mpq/sound/cm/a/a-explosion-large-01.wav differ diff --git a/mpq/sound/cm/a/a-explosion-large-02.wav b/mpq/sound/cm/a/a-explosion-large-02.wav new file mode 100644 index 00000000..4bf9b8eb Binary files /dev/null and b/mpq/sound/cm/a/a-explosion-large-02.wav differ diff --git a/mpq/sound/cm/a/a-explosion-large-03.wav b/mpq/sound/cm/a/a-explosion-large-03.wav new file mode 100644 index 00000000..a4444d22 Binary files /dev/null and b/mpq/sound/cm/a/a-explosion-large-03.wav differ diff --git a/mpq/sound/cm/a/a-explosion-small-01.wav b/mpq/sound/cm/a/a-explosion-small-01.wav new file mode 100644 index 00000000..ce63c575 Binary files /dev/null and b/mpq/sound/cm/a/a-explosion-small-01.wav differ diff --git a/mpq/sound/cm/a/a-explosion-small-02.wav b/mpq/sound/cm/a/a-explosion-small-02.wav new file mode 100644 index 00000000..ee5737dd Binary files /dev/null and b/mpq/sound/cm/a/a-explosion-small-02.wav differ diff --git a/mpq/sound/cm/a/a-explosion-small-03.wav b/mpq/sound/cm/a/a-explosion-small-03.wav new file mode 100644 index 00000000..8df61828 Binary files /dev/null and b/mpq/sound/cm/a/a-explosion-small-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wh-01.wav b/mpq/sound/cm/f-t/blackguard/wh-01.wav new file mode 100644 index 00000000..2f283ca1 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wh-01.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wh-02.wav b/mpq/sound/cm/f-t/blackguard/wh-02.wav new file mode 100644 index 00000000..78d741ed Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wh-02.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wh-03.wav b/mpq/sound/cm/f-t/blackguard/wh-03.wav new file mode 100644 index 00000000..87712560 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wh-03.wav differ diff --git a/mpq/unit/cm/zerg/malkothrokor-birth.grp b/mpq/unit/cm/zerg/malkothrokor-birth.grp new file mode 100644 index 00000000..71ff7259 Binary files /dev/null and b/mpq/unit/cm/zerg/malkothrokor-birth.grp differ diff --git a/mpq/unit/cm/zerg/malkothrokor.grp b/mpq/unit/cm/zerg/malkothrokor.grp index eaebe532..a52a2013 100644 Binary files a/mpq/unit/cm/zerg/malkothrokor.grp and b/mpq/unit/cm/zerg/malkothrokor.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index a4006232..7cc2535d 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 e4f6036d..24869d33 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 bc20786b..54d00422 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -51,6 +51,8 @@ - **Amaranth** banter can now only play if the Amaranth is above 80% life - Added visuals for: - **Adrenal Frenzy** +- Added weaponhit SFX for: + - **Blackguard** - New icons for: (c. Raenarill) - Weapons: Cabalist, Golem, Vibrance, Cikralisk, Protathalor, Ghitorokor, Kagralisk, Evigrilisk, Okrimnilisk, Konvilisk, Akistrokor - Passives: Dishonorable Discharge, Lithe Organelle, Crushing Tide, Lashing Limbs, Endless Limbs diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 109dba82..c95ea635 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ