diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 4ac0d749..07587248 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 667f448c..c857e7af 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2846,19 +2846,19 @@ Legionnaire Order Passive 02 Legionnaire Order Passive 03 Legionnaire Order Passive 04 Raynor Maverick Ready 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 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Panoptus Weaponhit 01 +Talos Salvage Loop 01 +Bactalisk Weaponfire 01 +Bactalisk Weaponfire 02 +Bactalisk Weaponfire 03 +Bactalisk Weaponhit 01 +Bactalisk Weaponhit 02 +Bactalisk Weaponhit 03 +Hierophant Weaponfire 01 +Hierophant Weaponfire 02 +Ministry Selected 01 +Phalanx Weaponhit B 01 +Exemplar Death 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 933252e3..d3a5acff 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2845,4 +2845,17 @@ cm\p\legionnaire\yes-01.wav cm\p\legionnaire\yes-02.wav cm\p\legionnaire\yes-03.wav cm\p\legionnaire\yes-04.wav -terran\raynorm\rdy-01.wav \ No newline at end of file +terran\raynorm\rdy-01.wav +cm\p\panoptus\wh-01.wav +cm\t\talos\stun-01.wav +cm\z\bactalisk\wf-01.wav +cm\z\bactalisk\wf-02.wav +cm\z\bactalisk\wf-03.wav +cm\z\bactalisk\wh-01.wav +cm\z\bactalisk\wh-02.wav +cm\z\bactalisk\wh-03.wav +cm\p\hierophant\wf-01.wav +cm\p\hierophant\wf-02.wav +cm\t\_building\ministry.wav +cm\t\phalanx\wh2-01.wav +cm\p\exemplar\dth-01.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index c12e8477..7fcb0ad4 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 41432972..7522391b 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 8f6174b1..aadadc94 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -5493,7 +5493,7 @@ EidolonUnused1: wait 1 nobrkcodestart setfldirect 0 - playsndbtwn 1166 1167 # Eidolon revive 01, 02 + playsnd 1166 # Eidolon revive 01 playfram 228 wait 2 playfram 227 @@ -15090,7 +15090,7 @@ AntiMatterMissileGndAttkInit: AntiMatterMissileDeath: imgol 442 0 0 # Anti-Matter Missile Hit (thingy\HKexplod.grp) if bullet.weapon_id == 71 goto AntiMatterMissileEmpyrean - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 2848 # Panoptus weaponhit 01 domissiledmg wait 1 end @@ -15164,7 +15164,7 @@ PhaseDisruptorDeath: imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) domissiledmg if bullet.weapon_id == 66 goto PhaseDisruptor_Dracadin - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 2848 # Panoptus weaponhit 01 wait 1 end @@ -15657,7 +15657,7 @@ ArcliteShockCannonHitInit: playfram 1 wait 1 ArcliteShockCannonHitDeath: - playsnd 968 # Misc\CRITTERS\PbWht01.wav + playsnd 2859 # Phalanx Siege weaponhit 01 playfram 2 domissiledmg wait 1 @@ -16045,7 +16045,7 @@ Venom_Unused_GndAttkInit: Venom_Unused_Death: domissiledmg if bullet.weapon_id == 37 goto Venom_Unused_Unused2 - playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav + playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 imgol 508 0 0 # Venom Hit (Unused) (thingy\etgHit.grp) wait 1 end @@ -16060,7 +16060,7 @@ Venom_Unused_Unused2: end Venom_Unused_SpecialState1: - playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav + playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg goto Venom_Unused_GndAttkInit @@ -22027,7 +22027,7 @@ ExemplarWalkingToIdle: goto ExemplarWalkingToIdle ExemplarDeath: - playsnd 975 # Misc\CRITTERS\ScDeath01.wav + playsnd 2860 # Exemplar death 01 imgol 1565 0 0 # Protoss Explosion (Medium) wait 5 imgol 1563 -8 0 # Exemplar Death @@ -22412,42 +22412,42 @@ Death RestorationHitDeath # ----------------------------------------------------------------------------- # RestorationHitInit: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 - playfram 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - wait 1 - playfram 10 # Frame set 0, direction 10 - wait 1 - playfram 11 # Frame set 0, direction 11 - wait 1 - playfram 12 # Frame set 0, direction 12 - wait 1 - playfram 13 # Frame set 0, direction 13 - wait 1 - playfram 14 # Frame set 0, direction 14 - wait 1 - playfram 15 # Frame set 0, direction 15 - wait 1 + 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 + playfram 14 + wait 1 + playfram 15 + wait 1 goto RestorationHitDeath RestorationHitDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -30315,14 +30315,14 @@ GladiusWeaponGndAttkInit: GladiusWeaponDeath: sprol 606 0 0 # Warden Hit (thingy\phohit.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 2848 # Panoptus weaponhit 01 domissiledmg wait 1 end GladiusWeaponSpecialState1: sprol 606 0 0 # Warden Hit (thingy\phohit.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 2848 # Panoptus weaponhit 01 domissiledmg goto GladiusWeaponGndAttkInit @@ -30439,7 +30439,7 @@ BactaliskUnused1: wait 1 nobrkcodestart setfldirect 0 - playsnd 1172 + playsnd 1172 # Hydralisk Revive 01 playfram 567 wait 2 playfram 566 @@ -30469,7 +30469,7 @@ BactaliskGndAttkInit: playfram 0xee wait 1 playfram 0xff - playsndbtwn 46 48 # Misc\CRITTERS\JCrWht00.wav | Misc\CRITTERS\JCrWht02.wav + playsndbtwn 2850 2852 # Bactalisk weaponfire 01, 02, 03 sproluselo 332 0 # Needle Spines (thingy\spooge.grp) attackwith 1 wait 2 @@ -32832,7 +32832,7 @@ BurstLasersExplosiveGndAttkInit: BurstLasersExplosiveDeath: imgol 1245 0 0 # Arclite Shock Cannon Hit Silent (thingy\mushroom.grp) if bullet.weapon_id == 39 goto BurstLasersExplosiveDeathPenumbra - playsnd 968 # Misc\CRITTERS\PbWht01.wav + playsnd 2859 # Phalanx Siege weaponhit 01 goto BurstLasersExplosiveDeathFinal BurstLasersExplosiveDeathPenumbra: @@ -35553,7 +35553,7 @@ HierophantGndAttkRpt: wait 1 playfram 0x187 wait 1 - playsndbtwn 970 971 # Misc\CRITTERS\PbWht03.wav | Misc\CRITTERS\PBDeath01.wav + playsndbtwn 2856 2857 # Hierophant weaponfire 01, 02 attackwith 1 playfram 0x176 wait 1 @@ -37883,7 +37883,7 @@ ArcliteShockCannonHitDamagelessInit: wait 2 ArcliteShockCannonHitDamagelessDeath: playfram 0x00 - playsnd 968 # Misc\CRITTERS\PbWht01.wav + playsnd 2859 # Phalanx Siege weaponhit 01 wait 1 playfram 1 wait 1 @@ -37988,7 +37988,7 @@ HallucinationProjectileGndAttkInit: HallucinationProjectileDeath: imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 2848 # Panoptus weaponhit 01 domissiledmg playfram 9 wait 1 @@ -38097,7 +38097,7 @@ PhaseDisruptorElectricSilentGndAttkInit: PhaseDisruptorElectricSilentDeath: imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 2848 # Panoptus weaponhit 01 domissiledmg wait 1 end @@ -39913,7 +39913,7 @@ AnticthonGndAttkInit: AnticthonAirAttkInit: playsndbtwn 1634 1636 # Anticthon weapon fire 01, 02, 03 attackwith 1 - imgol 978 0 0 + imgol 978 0 0 # Anticthon/Anthelion weaponfire wait 1 gotorepeatattk goto AnticthonGndAttkToIdle @@ -43264,7 +43264,7 @@ KagraliskVenomDeath: domissiledmg imgol 1097 0 0 # Nathrokor Attack Overlay if bullet.weapon_id == 95 goto KonviliskVenomDeath - playsndbtwn 49 51 # Bactalisk weaponhit 01, 02, 03 + playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 wait 1 end @@ -49955,14 +49955,14 @@ BactaliskAcidGndAttkInit: goto BactaliskAcidGndAttkInit BactaliskAcidDeath: - playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav + playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg wait 1 end BactaliskAcidSpecialState1: - playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav + playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg goto Venom_Unused_GndAttkInit diff --git a/mpq/sound/misc/critters/ScDeath01.wav b/mpq/sound/cm/p/exemplar/dth-01.wav similarity index 100% rename from mpq/sound/misc/critters/ScDeath01.wav rename to mpq/sound/cm/p/exemplar/dth-01.wav diff --git a/mpq/sound/misc/critters/PbDeath01.wav b/mpq/sound/cm/p/hierophant/wf-01.wav similarity index 100% rename from mpq/sound/misc/critters/PbDeath01.wav rename to mpq/sound/cm/p/hierophant/wf-01.wav diff --git a/mpq/sound/misc/critters/PbWht03.wav b/mpq/sound/cm/p/hierophant/wf-02.wav similarity index 100% rename from mpq/sound/misc/critters/PbWht03.wav rename to mpq/sound/cm/p/hierophant/wf-02.wav diff --git a/mpq/sound/misc/critters/BCrWht00.WAV b/mpq/sound/cm/p/panoptus/wh-01.wav similarity index 100% rename from mpq/sound/misc/critters/BCrWht00.WAV rename to mpq/sound/cm/p/panoptus/wh-01.wav diff --git a/mpq/sound/misc/critters/PbWht02.wav b/mpq/sound/cm/t/_building/ministry.wav similarity index 100% rename from mpq/sound/misc/critters/PbWht02.wav rename to mpq/sound/cm/t/_building/ministry.wav diff --git a/mpq/sound/misc/critters/PbWht01.wav b/mpq/sound/cm/t/phalanx/wh2-01.wav similarity index 100% rename from mpq/sound/misc/critters/PbWht01.wav rename to mpq/sound/cm/t/phalanx/wh2-01.wav diff --git a/mpq/sound/misc/critters/BCrWht01.wav b/mpq/sound/cm/t/talos/stun-01.wav similarity index 100% rename from mpq/sound/misc/critters/BCrWht01.wav rename to mpq/sound/cm/t/talos/stun-01.wav diff --git a/mpq/sound/misc/critters/JCrWht00.wav b/mpq/sound/cm/z/bactalisk/wf-01.wav similarity index 100% rename from mpq/sound/misc/critters/JCrWht00.wav rename to mpq/sound/cm/z/bactalisk/wf-01.wav diff --git a/mpq/sound/misc/critters/JCrWht01.wav b/mpq/sound/cm/z/bactalisk/wf-02.wav similarity index 100% rename from mpq/sound/misc/critters/JCrWht01.wav rename to mpq/sound/cm/z/bactalisk/wf-02.wav diff --git a/mpq/sound/misc/critters/JCrWht02.wav b/mpq/sound/cm/z/bactalisk/wf-03.wav similarity index 100% rename from mpq/sound/misc/critters/JCrWht02.wav rename to mpq/sound/cm/z/bactalisk/wf-03.wav diff --git a/mpq/sound/misc/critters/JCrDth00.wav b/mpq/sound/cm/z/bactalisk/wh-01.wav similarity index 100% rename from mpq/sound/misc/critters/JCrDth00.wav rename to mpq/sound/cm/z/bactalisk/wh-01.wav diff --git a/mpq/sound/misc/critters/LCrWht00.wav b/mpq/sound/cm/z/bactalisk/wh-02.wav similarity index 100% rename from mpq/sound/misc/critters/LCrWht00.wav rename to mpq/sound/cm/z/bactalisk/wh-02.wav diff --git a/mpq/sound/misc/critters/LCrWht01.wav b/mpq/sound/cm/z/bactalisk/wh-03.wav similarity index 100% rename from mpq/sound/misc/critters/LCrWht01.wav rename to mpq/sound/cm/z/bactalisk/wh-03.wav diff --git a/mpq/sound/misc/critters/LCrDth00.wav b/mpq/sound/misc/critters/LCrDth00.wav deleted file mode 100644 index 97859b7e..00000000 Binary files a/mpq/sound/misc/critters/LCrDth00.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/LCrWht02.wav b/mpq/sound/misc/critters/LCrWht02.wav deleted file mode 100644 index bf84c3ed..00000000 Binary files a/mpq/sound/misc/critters/LCrWht02.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/ScWht01.wav b/mpq/sound/misc/critters/ScWht01.wav deleted file mode 100644 index 1690ce57..00000000 Binary files a/mpq/sound/misc/critters/ScWht01.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/ScWht02.wav b/mpq/sound/misc/critters/ScWht02.wav deleted file mode 100644 index 886317b5..00000000 Binary files a/mpq/sound/misc/critters/ScWht02.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/ScWht03.wav b/mpq/sound/misc/critters/ScWht03.wav deleted file mode 100644 index fd822992..00000000 Binary files a/mpq/sound/misc/critters/ScWht03.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/TerDeath01.wav b/mpq/sound/misc/critters/TerDeath01.wav deleted file mode 100644 index 68d41f01..00000000 Binary files a/mpq/sound/misc/critters/TerDeath01.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/TerWht01.wav b/mpq/sound/misc/critters/TerWht01.wav deleted file mode 100644 index b31c9466..00000000 Binary files a/mpq/sound/misc/critters/TerWht01.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/TerWht02.wav b/mpq/sound/misc/critters/TerWht02.wav deleted file mode 100644 index ce596de3..00000000 Binary files a/mpq/sound/misc/critters/TerWht02.wav and /dev/null differ diff --git a/mpq/sound/misc/critters/TerWht03.wav b/mpq/sound/misc/critters/TerWht03.wav deleted file mode 100644 index 34d27463..00000000 Binary files a/mpq/sound/misc/critters/TerWht03.wav and /dev/null differ diff --git a/patchnotes.md b/patchnotes.md index f149f33b..65b364c0 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -72,6 +72,7 @@ Patch goals include: - Fixed Lobotomy Mines not targeting units that had previously burrowed (c. DF) - Fixed logic for Stewards returning to Solarions upon taking any damage, instead of the intended 50% HP threshold - Improved decollision behaviors for iscript units (c. DF) + - Fixed Dilettante corpses not being consumable (r. GreenEggs'NSpam) - Lardfix: the fading of music no longer slows down navigation between certain menus (c. DF) - Prospectively resolved errant unit interactions when restarting maps (r. lolrsk8s, c. DF & Veeq7) - **AI:** @@ -87,6 +88,7 @@ Patch goals include: - Fixed "set_player_unit_name" custom trigger action (c. DF) - Filled in missing unit responses for Protathalor (r. jakulangski) - Corrected Shaman Visionary Mode death SFX + - Corrected Luminary Aural Assault tooltip (r. GreenEggs'NSpam) ## Audiovisuals - **New sprites:** @@ -98,6 +100,7 @@ Patch goals include: - Changed sound flags for Zealot death SFX to allow it to overlap - Improved under attack responses for Scribe, Cabalist, Mind Tyrant, Archon, Panoptus - Improved Goliath death SFX + - Removed extra Eidolon revive SFX (r. GreenEggs'NSpam) - **New weapon SFX:** (some c. lolrsk8s & IskatuMesk) - Weaponfire: Matador (Cinder), Scribe, Artisan, Analogue - Weaponhit: Penumbra, Dracadin diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 21e1a823..d9767071 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ