diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index eb105254..2037fd78 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index df8584d4..6711ccf7 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.tbl b/mpq/arr/sfxdata.tbl index 36aee3bd..660bbb03 100644 Binary files a/mpq/arr/sfxdata.tbl and b/mpq/arr/sfxdata.tbl differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index f876db7a..f25adbc3 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2134,9 +2134,9 @@ Vagrant Shade Weaponfire 02 Vagrant Shade Weaponfire 03 Vagrant Shade Weaponfire 04 Vagrant Shade Weaponfire 05 -Optecton Weaponfire 01 -Optecton Weaponfire 02 -Optecton Weaponfire 03 +Optecton Weaponfire 2 01 +Optecton Weaponfire 2 02 +Optecton Weaponfire 2 03 Hippogriff Weaponfire 01 Hippogriff Weaponfire 02 Hippogriff Weaponfire 03 @@ -2308,10 +2308,10 @@ Madrigal Dirge Proc 01 Madrigal Dirge Proc 02 Madrigal Dirge Proc 03 Didact Stasis Field Channel 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Optecton Weaponfire 1 01 +Optecton Weaponfire 1 02 +Optecton Weaponfire 1 03 +Optecton Weaponfire 1 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 688f1933..26f33110 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index d80017be..ff6afa5c 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -30795,7 +30795,7 @@ AirAttkInit AtreusGndAttkInit Unused1 [NONE] GndAttkRpt AtreusGndAttkInit AirAttkRpt AtreusGndAttkInit -CastSpell AtreusCastSpell +CastSpell [NONE] GndAttkToIdle AtreusGndAttkToIdle AirAttkToIdle AtreusGndAttkToIdle Unused2 [NONE] @@ -30897,26 +30897,7 @@ AtreusGndAttkRpt: nobrkcodeend gotorepeatattk ignorerest - goto AtreusGndAttkToIdle - -AtreusCastSpell: - playfram 0x00 - wait 1 - nobrkcodestart - playfram 0x1A9 - playsnd 101 # Bullet\LaserB.wav - castspell - sigorder 2 - wait 1 - playfram 0x1BA - wait 1 - playfram 0x1CB - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk - goto AtreusGndAttkToIdle + goto AtreusGndAttkToIdle AtreusWalking: move 4 @@ -30976,6 +30957,7 @@ AtreusWalkingToIdle: AtreusWarpIn: imgol 125 0 0 # High Templar Warp Flash (protoss\templar.grp) goto AtreusLocal00 + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1174 Amaranth (cm\protoss\amaranth.grp) @@ -52167,4 +52149,180 @@ SpirtithColonyBuilt: wait 2 playfram 0x00 wait 2 - goto SpirtithColonyBuilt \ No newline at end of file + goto SpirtithColonyBuilt + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1700 Optecton (cm\protoss\optecton.grp) +.headerstart +IsId 728 +Type 21 +Init OptectonInit +Death OptectonDeath +GndAttkInit OptectonGndAttkInit +AirAttkInit OptectonGndAttkInit +Unused1 [NONE] +GndAttkRpt OptectonGndAttkInit +AirAttkRpt OptectonGndAttkInit +CastSpell [NONE] +GndAttkToIdle OptectonGndAttkToIdle +AirAttkToIdle OptectonGndAttkToIdle +Unused2 [NONE] +Walking OptectonWalking +WalkingToIdle OptectonWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn OptectonWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +OptectonInit: + imgul 1625 0 0 # Optecton Shadow (cm\protoss\optecton-shad.grp) + playfram 0x00 + wait 2 +OptectonLocal00: + wait 1 + waitrand 62 74 + randcondjmp 25 OptectonLocal01 + randcondjmp 13 OptectonLocal02 + goto OptectonLocal00 + +OptectonLocal01: + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + waitrand 8 15 + playfram 0x33 + wait 1 + playfram 0x22 + wait 1 + randcondjmp 43 OptectonLocal01 + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + randcondjmp 13 OptectonLocal02 + goto OptectonLocal00 + +OptectonLocal02: + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + playfram 0x77 + wait 1 + playfram 0x88 + waitrand 8 15 + playfram 0x77 + wait 1 + playfram 0x66 + wait 1 + randcondjmp 43 OptectonLocal02 + playfram 0x55 + wait 1 + playfram 0x00 + wait 1 + randcondjmp 13 OptectonLocal01 + goto OptectonLocal00 + +OptectonGndAttkToIdle: + playfram 0x00 + wait 2 + goto OptectonLocal00 + +OptectonDeath: + playsnd 533 # Protoss\Scout\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 2 + lowsprul 192 0 0 # Dracadin Remnants (protoss\pdrDeath.grp) + wait 1 + end + +OptectonGndAttkInit: + playfram 0x00 +OptectonGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x1A9 + playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 + attackwith 1 + wait 1 + playfram 0x1BA + wait 1 + playfram 0x1CB + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto OptectonGndAttkToIdle + +OptectonWalking: + move 4 + wait 1 + playfram 0xcc + move 4 + wait 1 + playfram 0xdd + move 4 + wait 1 + playfram 0xee + move 4 + wait 1 + playfram 0xff + move 4 + wait 1 + playfram 0x110 + move 4 + wait 1 + playfram 0x121 + move 4 + wait 1 + playfram 0x132 + move 4 + wait 1 + playfram 0x143 + move 4 + wait 1 + playfram 0x154 + move 4 + wait 1 + playfram 0x165 + move 4 + wait 1 + playfram 0x176 + move 4 + wait 1 + playfram 0x187 + move 4 + wait 1 + playfram 0x198 + move 4 + wait 1 + playfram 0x99 + move 4 + wait 1 + playfram 0xaa + move 4 + wait 1 + playfram 0xbb + goto OptectonWalking + +OptectonWalkingToIdle: + playfram 0x00 + goto OptectonLocal00 + +OptectonWarpIn: + imgol 125 0 0 # High Templar Warp Flash (protoss\templar.grp) + goto OptectonLocal00 \ No newline at end of file diff --git a/mpq/sound/cm/p/optecton/wf-01.wav b/mpq/sound/cm/p/optecton/wf-01.wav deleted file mode 100644 index 13e1ea14..00000000 Binary files a/mpq/sound/cm/p/optecton/wf-01.wav and /dev/null differ diff --git a/mpq/sound/cm/p/optecton/wf-02.wav b/mpq/sound/cm/p/optecton/wf-02.wav deleted file mode 100644 index 31d05720..00000000 Binary files a/mpq/sound/cm/p/optecton/wf-02.wav and /dev/null differ diff --git a/mpq/sound/cm/p/optecton/wf-03.wav b/mpq/sound/cm/p/optecton/wf-03.wav deleted file mode 100644 index 53a06c1a..00000000 Binary files a/mpq/sound/cm/p/optecton/wf-03.wav and /dev/null differ diff --git a/mpq/sound/cm/p/optecton/wf-04.wav b/mpq/sound/cm/p/optecton/wf-04.wav deleted file mode 100644 index 7b534242..00000000 Binary files a/mpq/sound/cm/p/optecton/wf-04.wav and /dev/null differ diff --git a/mpq/sound/cm/p/optecton/wfa-01.wav b/mpq/sound/cm/p/optecton/wfa-01.wav new file mode 100644 index 00000000..5c6c801d Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfa-01.wav differ diff --git a/mpq/sound/cm/p/optecton/wfa-02.wav b/mpq/sound/cm/p/optecton/wfa-02.wav new file mode 100644 index 00000000..0591810c Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfa-02.wav differ diff --git a/mpq/sound/cm/p/optecton/wfa-03.wav b/mpq/sound/cm/p/optecton/wfa-03.wav new file mode 100644 index 00000000..96509c06 Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfa-03.wav differ diff --git a/mpq/sound/cm/p/optecton/wfa-04.wav b/mpq/sound/cm/p/optecton/wfa-04.wav new file mode 100644 index 00000000..05884fcc Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfa-04.wav differ diff --git a/mpq/sound/cm/p/optecton/wfb-01.wav b/mpq/sound/cm/p/optecton/wfb-01.wav new file mode 100644 index 00000000..9e4c23e3 Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfb-01.wav differ diff --git a/mpq/sound/cm/p/optecton/wfb-02.wav b/mpq/sound/cm/p/optecton/wfb-02.wav new file mode 100644 index 00000000..c6fddf9b Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfb-02.wav differ diff --git a/mpq/sound/cm/p/optecton/wfb-03.wav b/mpq/sound/cm/p/optecton/wfb-03.wav new file mode 100644 index 00000000..eb56105c Binary files /dev/null and b/mpq/sound/cm/p/optecton/wfb-03.wav differ diff --git a/mpq/sound/cm/t/madcap/wf-01.wav b/mpq/sound/cm/t/madcap/wf-01.wav index a251a3c1..1d3ec1f7 100644 Binary files a/mpq/sound/cm/t/madcap/wf-01.wav and b/mpq/sound/cm/t/madcap/wf-01.wav differ diff --git a/mpq/sound/cm/t/madcap/wf-02.wav b/mpq/sound/cm/t/madcap/wf-02.wav index 169a3196..d79e2298 100644 Binary files a/mpq/sound/cm/t/madcap/wf-02.wav and b/mpq/sound/cm/t/madcap/wf-02.wav differ diff --git a/mpq/sound/cm/t/madcap/wf-03.wav b/mpq/sound/cm/t/madcap/wf-03.wav index 55896128..95de5c70 100644 Binary files a/mpq/sound/cm/t/madcap/wf-03.wav and b/mpq/sound/cm/t/madcap/wf-03.wav differ diff --git a/mpq/sound/cm/t/madcap/wf-04.wav b/mpq/sound/cm/t/madcap/wf-04.wav index 55896128..39651e35 100644 Binary files a/mpq/sound/cm/t/madcap/wf-04.wav and b/mpq/sound/cm/t/madcap/wf-04.wav differ diff --git a/mpq/sound/cm/t/madcap/wf-05.wav b/mpq/sound/cm/t/madcap/wf-05.wav index 5759e302..0827268e 100644 Binary files a/mpq/sound/cm/t/madcap/wf-05.wav and b/mpq/sound/cm/t/madcap/wf-05.wav differ diff --git a/mpq/sound/cm/t/sundog/wf-01.wav b/mpq/sound/cm/t/sundog/wf-01.wav index 3513ae02..7ec50650 100644 Binary files a/mpq/sound/cm/t/sundog/wf-01.wav and b/mpq/sound/cm/t/sundog/wf-01.wav differ diff --git a/mpq/sound/cm/t/sundog/wf-02.wav b/mpq/sound/cm/t/sundog/wf-02.wav index dbfd59f0..068da333 100644 Binary files a/mpq/sound/cm/t/sundog/wf-02.wav and b/mpq/sound/cm/t/sundog/wf-02.wav differ diff --git a/mpq/sound/cm/t/sundog/wf-03.wav b/mpq/sound/cm/t/sundog/wf-03.wav index 58c6b85e..3010c5ff 100644 Binary files a/mpq/sound/cm/t/sundog/wf-03.wav and b/mpq/sound/cm/t/sundog/wf-03.wav differ diff --git a/mpq/sound/cm/t/sundog/wf-04.wav b/mpq/sound/cm/t/sundog/wf-04.wav index 505ff113..8ff80d38 100644 Binary files a/mpq/sound/cm/t/sundog/wf-04.wav and b/mpq/sound/cm/t/sundog/wf-04.wav differ diff --git a/mpq/sound/cm/t/sundog/wf-05.wav b/mpq/sound/cm/t/sundog/wf-05.wav index 4deb1755..4c0ce868 100644 Binary files a/mpq/sound/cm/t/sundog/wf-05.wav and b/mpq/sound/cm/t/sundog/wf-05.wav differ diff --git a/mpq/sound/cm/t/sundog/wf-06.wav b/mpq/sound/cm/t/sundog/wf-06.wav index 2bc057cd..596411c3 100644 Binary files a/mpq/sound/cm/t/sundog/wf-06.wav and b/mpq/sound/cm/t/sundog/wf-06.wav differ diff --git a/mpq/sound/protoss/fenixd/UFdWht00.wav b/mpq/sound/protoss/fenixd/UFdWht00.wav index 792260d6..786cc16b 100644 Binary files a/mpq/sound/protoss/fenixd/UFdWht00.wav and b/mpq/sound/protoss/fenixd/UFdWht00.wav differ diff --git a/mpq/sound/protoss/fenixd/UFdWht01.wav b/mpq/sound/protoss/fenixd/UFdWht01.wav index dd4268f2..c450c6d7 100644 Binary files a/mpq/sound/protoss/fenixd/UFdWht01.wav and b/mpq/sound/protoss/fenixd/UFdWht01.wav differ diff --git a/mpq/sound/protoss/fenixd/UFdWht02.wav b/mpq/sound/protoss/fenixd/UFdWht02.wav index 75451014..f19efac4 100644 Binary files a/mpq/sound/protoss/fenixd/UFdWht02.wav and b/mpq/sound/protoss/fenixd/UFdWht02.wav differ diff --git a/patchnotes.md b/patchnotes.md index 4451bd39..795f11ce 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -22,6 +22,9 @@ Aside from that: We are continuing to polish existing content and remove low-cou ## Audiovisuals - Superior engine graphics for the Mason and the Trojan have been added (c. DarkenedFantasies) +- Weapon fire SFX for Madcap, Sundog, and Salamander have been adjusted to reduce clipping +- New weaponfire SFX: + - Optecton (both attacks) ## UI - Config: It is now possible to specify your default map directory, using file paths with single backslashes (e.g. "BroodWar\CMBW-Prerelease\CMBW-maps") (c. Veeq7) @@ -49,5 +52,7 @@ Aside from that: We are continuing to polish existing content and remove low-cou ## Protoss - [Mind Tyrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/mind-tyrant): - Maelstrom projectile now significantly slower +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - Skybond Ray damage now 10, from 5 - [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact): - Stasis Field is now a channel \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 4e24c04f..fd1b8d9a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ