diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 676a53ba..bb919bd7 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 5c84c8ef..e9399d36 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2653,27 +2653,27 @@ Ackmed Advisor Missile Launch 01 Ackmed Advisor Missile Launch 02 Ackmed Advisor No Build 01 Ackmed Advisor No Build 02 +Ackmed Advisor No Land 01 +Ackmed Advisor No Land 02 +Ackmed Advisor No Warp 01 +Ackmed Advisor No Warp 02 +Ackmed Advisor Tech 01 +Ackmed Advisor Tech 02 Ackmed Advisor No Vespene 01 Ackmed Advisor No Vespene 02 Ackmed Advisor No Vespene 03 Ackmed Advisor No Vespene 04 Ackmed Advisor Warp 01 Ackmed Advisor Warp 02 -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 -Extended Sound #1 -Extended Sound #1 +Analogue Weaponfire 01 +Analogue Weaponfire 02 +Analogue Weaponfire 03 +Scribe Weaponfire 01 +Scribe Weaponfire 02 +Scribe Weaponfire 03 +Dracadin Weaponhit 01 +Dracadin Weaponhit 02 +Dracadin Weaponhit 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index fd933d44..4c57a5e2 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2663,4 +2663,14 @@ cm\advisors\ackmed\ackmedad_vespene-01.wav cm\advisors\ackmed\ackmedad_vespene-02.wav cm\advisors\ackmed\ackmedad_vespene-03.wav cm\advisors\ackmed\ackmedad_vespene-04.wav -cm\advisors\ackmed\ackmedad_warp-01.wav \ No newline at end of file +cm\advisors\ackmed\ackmedad_warp-01.wav +cm\advisors\ackmed\ackmedad_warp-02.wav +cm\p\analogue\wf-01.wav +cm\p\analogue\wf-02.wav +cm\p\analogue\wf-03.wav +cm\p\scribe\wf-01.wav +cm\p\scribe\wf-02.wav +cm\p\scribe\wf-03.wav +cm\p\dracadin\wh-01.wav +cm\p\dracadin\wh-02.wav +cm\p\dracadin\wh-03.wav \ No newline at end of file diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 5190dacc..88085279 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -11082,6 +11082,7 @@ ScribeGndAttkInit: nobrkcodestart playfram 0x20 attackwith 1 + playsndbtwn 2670 2672 # Scribe weaponfire 01, 02, 03 wait 1 playfram 0x00 nobrkcodeend @@ -11094,6 +11095,7 @@ ScribeWalking: ScribeAlmostBuilt: useweapon 63 # Particle Beam (Harvest) (Particle Beam) + playsnd 614 # Protoss\PROBE\PPrMin00.WAV wait 9 goto ScribeAlmostBuilt @@ -14996,7 +14998,6 @@ ParticleBeamHitInit: wait 1 ParticleBeamHitDeath: playfram 0x00 - playsnd 614 # Protoss\PROBE\PPrMin00.WAV domissiledmg wait 1 playfram 1 @@ -15157,8 +15158,14 @@ PhaseDisruptorGndAttkInit: PhaseDisruptorDeath: imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav domissiledmg + if bullet.weapon_id == 66 goto PhaseDisruptor_Dracadin + playsnd 54 # Misc\CRITTERS\BCrWht00.wav + wait 1 + end + +PhaseDisruptor_Dracadin: + playsndbtwn 2673 2675 # Dracadin weaponhit 01, 02, 03 wait 1 end @@ -38091,7 +38098,7 @@ HallucinationProjectileGndAttkInit: HallucinationProjectileDeath: imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + playsnd 54 # Misc\CRITTERS\BCrWht00.wav domissiledmg playfram 9 wait 1 @@ -38182,27 +38189,27 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # PhaseDisruptorElectricSilentInit: - wait 1 - sigorder 1 - wait 1 + wait 1 + sigorder 1 + wait 1 PhaseDisruptorElectricSilentGndAttkInit: - 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 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 goto PhaseDisruptorElectricSilentGndAttkInit PhaseDisruptorElectricSilentDeath: - imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) - playsnd 54 # Misc\CRITTERS\BCrWht00.wav + imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) + playsnd 54 # Misc\CRITTERS\BCrWht00.wav domissiledmg - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -45493,20 +45500,20 @@ HeraldGndAttkInit: playfram 0x2C0 wait 1 nobrkcodestart - playfram 0x2E0 - wait 1 +# playfram 0x2E0 +# wait 1 playfram 0x300 wait 1 - playfram 0x320 - wait 1 +# playfram 0x320 +# wait 1 playfram 0x340 wait 1 - playfram 0x360 - wait 1 +# playfram 0x360 +# wait 1 playfram 0x380 wait 1 - playfram 0x3A0 - wait 1 +# playfram 0x3A0 +# wait 1 playfram 0x3C0 wait 1 playfram 0x3E0 @@ -50490,7 +50497,7 @@ AnalogueDeath: end AnalogueGndAttkInit: - playsndbtwn 1460 1464 # Barghest weaponfire 01, 02, 03, 04, 05 + playsndbtwn 2667 2669 # Analogue weaponfire 01, 02, 03 attack gotorepeatattk goto AnalogueGndAttkToIdle diff --git a/mpq/sound/cm/p/analogue/wf-01.wav b/mpq/sound/cm/p/analogue/wf-01.wav new file mode 100644 index 00000000..52ddcd24 Binary files /dev/null and b/mpq/sound/cm/p/analogue/wf-01.wav differ diff --git a/mpq/sound/cm/p/analogue/wf-02.wav b/mpq/sound/cm/p/analogue/wf-02.wav new file mode 100644 index 00000000..0f39fea3 Binary files /dev/null and b/mpq/sound/cm/p/analogue/wf-02.wav differ diff --git a/mpq/sound/cm/p/analogue/wf-03.wav b/mpq/sound/cm/p/analogue/wf-03.wav new file mode 100644 index 00000000..78ec6356 Binary files /dev/null and b/mpq/sound/cm/p/analogue/wf-03.wav differ diff --git a/mpq/sound/cm/p/dracadin/wh-01.wav b/mpq/sound/cm/p/dracadin/wh-01.wav new file mode 100644 index 00000000..ee05a60e Binary files /dev/null and b/mpq/sound/cm/p/dracadin/wh-01.wav differ diff --git a/mpq/sound/cm/p/dracadin/wh-02.wav b/mpq/sound/cm/p/dracadin/wh-02.wav new file mode 100644 index 00000000..f5bcb4b5 Binary files /dev/null and b/mpq/sound/cm/p/dracadin/wh-02.wav differ diff --git a/mpq/sound/cm/p/dracadin/wh-03.wav b/mpq/sound/cm/p/dracadin/wh-03.wav new file mode 100644 index 00000000..31d0cd50 Binary files /dev/null and b/mpq/sound/cm/p/dracadin/wh-03.wav differ diff --git a/mpq/sound/cm/p/scribe/wf-01.wav b/mpq/sound/cm/p/scribe/wf-01.wav new file mode 100644 index 00000000..71020d54 Binary files /dev/null and b/mpq/sound/cm/p/scribe/wf-01.wav differ diff --git a/mpq/sound/cm/p/scribe/wf-02.wav b/mpq/sound/cm/p/scribe/wf-02.wav new file mode 100644 index 00000000..0662a487 Binary files /dev/null and b/mpq/sound/cm/p/scribe/wf-02.wav differ diff --git a/mpq/sound/cm/p/scribe/wf-03.wav b/mpq/sound/cm/p/scribe/wf-03.wav new file mode 100644 index 00000000..7d19b5ef Binary files /dev/null and b/mpq/sound/cm/p/scribe/wf-03.wav differ diff --git a/patchnotes.md b/patchnotes.md index eef3637b..980d1d4b 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -17,11 +17,16 @@ Patch goals include: ## Audiovisuals - Adjusted Mortothrokor selection circle and death animation timing - Adjusted Legionnaire shadow, and walk and attack animations +- New weapon SFX: + - Weaponfire: Scribe, Analogue + - Weaponhit: Dracadin ## Protoss - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): - Weapon damage now 1x10, from 2x6 - Weapon cooldown now 0.79, from 0.83 +- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald): + - Significantly sped up attack animation ## Zerg - [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index c02ce3b3..f6f280e1 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ