diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 4e801e56..7c9049f0 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -614,7 +614,7 @@ Protoss\PROBE\PPrYes02.WAV Protoss\PROBE\PPrYes03.WAV Protoss\INTERCEP\PInLau00.WAV Protoss\PROBE\PPrPss00.WAV (2) -Protoss\TEMPLAR\PTeSum00.WAV (1) +Steward Launch 01 Protoss\TEMPLAR\PTeSum00.WAV (2) Protoss\TEMPLAR\PTeHal00.WAV Protoss\TEMPLAR\PTeHal01.WAV diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 2f9324bc..46311820 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 8d7cbd34..dcc51b77 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index 1c0e34af..d2af6b8d 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -221,7 +221,7 @@ Sensory Overload (Vibrance) Flamethrower (Harakan, Golden) Corrosive Bioplasma (Iziralisk) Phase Claws (Cicatus) -Extended Weapon #94 +Phase Blades (Zealot, Starbound) Extended Weapon #95 Extended Weapon #96 Extended Weapon #97 diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 055e21ce..0ba4c199 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -11318,12 +11318,12 @@ ZealotGndAttkRpt: playfram 0x33 wait 1 playfram 0x44 - attackmelee 1 664 # Protoss\ZEALOT\pzeHit00.WAV + attackmelee 1 0 wait 1 playfram 0x33 wait 1 playfram 0x22 - attackmelee 1 664 # Protoss\ZEALOT\pzeHit00.WAV + attackmelee 1 0 wait 1 playfram 0x11 wait 1 @@ -51584,7 +51584,7 @@ Death ZealotDeath GndAttkInit ZealotGndAttkInit AirAttkInit [NONE] Unused1 ZealotUnused1 -GndAttkRpt ZealotGndAttkInit +GndAttkRpt ZealotGndAttkRpt AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle ZealotGndAttkToIdle @@ -51604,33 +51604,10 @@ 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 # 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 +ZealotStarboundGndAttkInit: + playfram 0x00 + wait 1 + goto ZealotWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51693,10 +51670,10 @@ IsId 800 Type 21 Init CicatusInit Death LegionnaireDeath -GndAttkInit CicatusGndAttkInit +GndAttkInit LegionnaireGndAttkInit AirAttkInit [NONE] Unused1 [NONE] -GndAttkRpt CicatusGndAttkRpt +GndAttkRpt LegionnaireGndAttkRpt AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle LegionnaireGndAttkToIdle @@ -51720,26 +51697,4 @@ CicatusInit: imgul 1959 0 0 # Cicatus Shadow (cm\faction-p\cicatus-shadow.grp) goto MadcapWalkingToIdle -CicatusGndAttkInit: - playfram 0x100 -CicatusGndAttkRpt: - playfram 0x100 - nobrkcodestart - wait 1 - playsnd 1896 # Legionnaire weapon fire 01 - playfram 0x120 - attackmelee 1 1897 # Legionnaire weapon hit 01 - wait 1 - playfram 0x140 - attackmelee 1 1897 # Legionnaire weapon hit 01 - wait 1 - playfram 0x160 - wait 1 - nobrkcodeend - playfram 0x120 - wait 1 - gotorepeatattk - ignorerest - goto LegionnaireGndAttkToIdle - ## Next free IsId: 801 \ No newline at end of file diff --git a/mpq/unit/cm/faction-p/cicatus-shadow.grp b/mpq/unit/cm/faction-p/cicatus-shadow.grp index ee7b112b..443e4e63 100644 Binary files a/mpq/unit/cm/faction-p/cicatus-shadow.grp and b/mpq/unit/cm/faction-p/cicatus-shadow.grp differ diff --git a/mpq/unit/cm/faction-p/cicatus.grp b/mpq/unit/cm/faction-p/cicatus.grp index e535e7e3..c14c99b5 100644 Binary files a/mpq/unit/cm/faction-p/cicatus.grp and b/mpq/unit/cm/faction-p/cicatus.grp differ diff --git a/mpq/unit/cm/terran/madcap-shadow.grp b/mpq/unit/cm/terran/madcap-shadow.grp index d96e5763..9b7342b5 100644 Binary files a/mpq/unit/cm/terran/madcap-shadow.grp and b/mpq/unit/cm/terran/madcap-shadow.grp differ diff --git a/mpq/unit/cm/terran/madcap.grp b/mpq/unit/cm/terran/madcap.grp index bec39670..21b2cf34 100644 Binary files a/mpq/unit/cm/terran/madcap.grp and b/mpq/unit/cm/terran/madcap.grp differ diff --git a/patchnotes.md b/patchnotes.md index b6019fe5..d2e5c7f9 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -20,6 +20,8 @@ We are still hunting for desyncs! Please submit your `Critical` and `Sync Random - when placed for P1-P8 and cloaked, any preplaced units for that player will be created, allowing players to select their race without spawning melee units ## Bugfixes +- **Stability:** + - Attempt to fix a middle mouse button scroll crash (r. TopRamen & iliektoeatgrass; c. DF, Jesse, & Veeq7) - **Gameplay:** - Units will now only target Solarions over Stewards if the Solarion is within weapon range (a. Veeq7) - **Audiovisuals:** @@ -35,6 +37,7 @@ We are still hunting for desyncs! Please submit your `Critical` and `Sync Random - Updated sprite for: - Madcap (a. Solstice) - Legionnaire + - Cicatus ## Terran - [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index e857c200..4eb1cd86 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ