diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 5780d46c..5343f40b 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 e8801317..7b813336 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3227,9 +3227,9 @@ Stroluum Under Attack 02 Stroluum Under Attack 03 Stroluum Under Attack 04 Zealot (Starbound) Weaponhit 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Terran Construction 01 +Terran Construction 02 +Terran Construction 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 30ceffa5..0c552d14 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3021,10 +3021,10 @@ cm\p\empress\hlp-04.wav cm\t\madcap\pas-01.wav cm\t\madcap\pas-02.wav 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 +cm\t\_building\t-addon-01.wav +cm\t\_building\t-addon-02.wav +cm\t\_building\t-addon-03.wav +cm\t\_building\t-addon-04.wav cm\z\cikralisk\wf-01.wav cm\z\cikralisk\wf-02.wav cm\z\cikralisk\wf-03.wav @@ -3226,4 +3226,10 @@ cm\heroes\stroluum\hlp-01.wav cm\heroes\stroluum\hlp-02.wav cm\heroes\stroluum\hlp-02.wav cm\heroes\stroluum\hlp-02.wav -cm\f-p\zealot-starbound\wh-01.wav \ No newline at end of file +cm\f-p\zealot-starbound\wh-01.wav +cm\t\_building\t-construction-01.wav +cm\t\_building\t-construction-02.wav +cm\t\_building\t-construction-03.wav +cm\t\repair-terran-01.wav +cm\t\repair-terran-02.wav +cm\t\repair-terran-03.wav \ No newline at end of file diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 84f55245..9ede2dcb 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -6438,6 +6438,7 @@ MasonGndAttkInit: wait 1 playfram 0x22 attackwith 1 + playsndbtwn 35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav wait 1 playfram 0x11 wait 1 @@ -6465,11 +6466,12 @@ MasonAlmostBuilt: MasonLocal00: playfram 0x22 useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) + sigorder 32 wait 1 playfram 0x11 - wait 8 + wait 12 goto MasonLocal00 - + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 256 Vulture (terran\vulture.grp) @@ -14777,7 +14779,6 @@ FusionCutterHitInit: wait 1 FusionCutterHitDeath: playfram 0x00 - playsndbtwn 35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav domissiledmg wait 1 playfram 1 @@ -29064,11 +29065,12 @@ TalosAlmostBuilt: TalosLocal00: playfram 0x40 useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) - wait 2 + sigorder 32 + wait 1 playfram 0x20 - wait 2 + wait 1 playfram 0x00 - wait 6 + wait 8 goto TalosLocal00 # ----------------------------------------------------------------------------- # @@ -51956,10 +51958,10 @@ IsId 797 Type 21 Init ZealotInit Death ZealotDeath -GndAttkInit ZealotStarboundGndAttkInit +GndAttkInit ZealotGndAttkInit AirAttkInit [NONE] Unused1 ZealotUnused1 -GndAttkRpt ZealotStarboundGndAttkRpt +GndAttkRpt ZealotGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle ZealotGndAttkToIdle @@ -51979,33 +51981,33 @@ WarpIn ZealotWarpIn .headerend # ----------------------------------------------------------------------------- # -ZealotStarboundGndAttkInit: - playfram 0x00 - wait 1 -ZealotStarboundGndAttkRpt: - playsndrand 2 662 663 # Protoss\ZEALOT\pzeAtt00.WAV | Protoss\ZEALOT\pzeAtt01.WAV - playfram 0x11 - wait 1 - nobrkcodestart - playfram 0x22 - wait 1 - playfram 0x33 - wait 1 - playfram 0x44 - attackmelee 1 3228 # Protoss\ZEALOT\pzeHit00.WAV - wait 1 - playfram 0x33 - wait 1 - playfram 0x22 - attackmelee 1 3228 # Protoss\ZEALOT\pzeHit00.WAV - wait 1 - playfram 0x11 - wait 1 - playfram 0x00 - nobrkcodeend - gotorepeatattk - ignorerest - goto ZealotGndAttkToIdle +#ZealotStarboundGndAttkInit: +# playfram 0x00 +# wait 1 +#ZealotStarboundGndAttkRpt: +# playsndrand 2 662 663 # Protoss\ZEALOT\pzeAtt00.WAV | Protoss\ZEALOT\pzeAtt01.WAV +# playfram 0x11 +# wait 1 +# nobrkcodestart +# playfram 0x22 +# wait 1 +# playfram 0x33 +# wait 1 +# playfram 0x44 +# attackmelee 1 3228 # Zealot (Starbound) weaponhit 01 +# wait 1 +# playfram 0x33 +# wait 1 +# playfram 0x22 +# attackmelee 1 3228 # Zealot (Starbound) weaponhit 01 +# wait 1 +# playfram 0x11 +# wait 1 +# playfram 0x00 +# nobrkcodeend +# gotorepeatattk +# ignorerest +# goto ZealotGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52013,7 +52015,7 @@ ZealotStarboundGndAttkRpt: .headerstart IsId 798 Type 12 -Init VibranceInit +Init AnalogueInit Death AnalogueDeath GndAttkInit AnalogueGndAttkInit AirAttkInit AnalogueGndAttkInit @@ -52030,10 +52032,10 @@ SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # -VibranceInit: - imgul 1947 0 7 # Vibrance Shadow (cm\protoss\vibrance.grp) - playfram 0x00 - wait 2 - goto AnalogueGndAttkToIdle +#VibranceInit: +# imgul 1947 0 7 # Vibrance Shadow (cm\protoss\vibrance.grp) +# playfram 0x00 +# wait 2 +# goto AnalogueGndAttkToIdle ## Next free IsId: 799 \ No newline at end of file diff --git a/mpq/sound/cm/t/_building/_construct-01.wav b/mpq/sound/cm/t/_building/t-addon-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/_construct-01.wav rename to mpq/sound/cm/t/_building/t-addon-01.wav diff --git a/mpq/sound/cm/t/_building/_construct-02.wav b/mpq/sound/cm/t/_building/t-addon-02.wav similarity index 100% rename from mpq/sound/cm/t/_building/_construct-02.wav rename to mpq/sound/cm/t/_building/t-addon-02.wav diff --git a/mpq/sound/cm/t/_building/_construct-03.wav b/mpq/sound/cm/t/_building/t-addon-03.wav similarity index 100% rename from mpq/sound/cm/t/_building/_construct-03.wav rename to mpq/sound/cm/t/_building/t-addon-03.wav diff --git a/mpq/sound/cm/t/_building/_construct-04.wav b/mpq/sound/cm/t/_building/t-addon-04.wav similarity index 100% rename from mpq/sound/cm/t/_building/_construct-04.wav rename to mpq/sound/cm/t/_building/t-addon-04.wav diff --git a/mpq/sound/cm/t/_building/t-construction-01.wav b/mpq/sound/cm/t/_building/t-construction-01.wav new file mode 100644 index 00000000..a3e1168e Binary files /dev/null and b/mpq/sound/cm/t/_building/t-construction-01.wav differ diff --git a/mpq/sound/cm/t/_building/t-construction-02.wav b/mpq/sound/cm/t/_building/t-construction-02.wav new file mode 100644 index 00000000..899f537a Binary files /dev/null and b/mpq/sound/cm/t/_building/t-construction-02.wav differ diff --git a/mpq/sound/cm/t/_building/t-construction-03.wav b/mpq/sound/cm/t/_building/t-construction-03.wav new file mode 100644 index 00000000..eaac7b99 Binary files /dev/null and b/mpq/sound/cm/t/_building/t-construction-03.wav differ diff --git a/mpq/sound/cm/t/repair-terran-01.wav b/mpq/sound/cm/t/repair-terran-01.wav new file mode 100644 index 00000000..d50b17b2 Binary files /dev/null and b/mpq/sound/cm/t/repair-terran-01.wav differ diff --git a/mpq/sound/cm/t/repair-terran-02.wav b/mpq/sound/cm/t/repair-terran-02.wav new file mode 100644 index 00000000..4f76d73f Binary files /dev/null and b/mpq/sound/cm/t/repair-terran-02.wav differ diff --git a/mpq/sound/cm/t/repair-terran-03.wav b/mpq/sound/cm/t/repair-terran-03.wav new file mode 100644 index 00000000..309ed3a3 Binary files /dev/null and b/mpq/sound/cm/t/repair-terran-03.wav differ diff --git a/patchnotes.md b/patchnotes.md index 371bbba9..6abc24f0 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -68,6 +68,8 @@ Forthcoming. ## Audiovisuals - New ambient event SFX for: + - Terran worker-based construction + - Terran repairs - Zerg Egg hatch - New unit responses for: - Durendal, Cataphract diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index afc9ab0e..483f1818 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ