diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 76b50bc5..01dfb4b4 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index a49d7344..ca5434b4 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 1afbb574..2def2159 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -572,7 +572,7 @@ Terran Vulture (Upstart) Terran Cutlass (Futurist) Cutlass Turret (Futurist) Terran Maverick (Upstart) -Protoss Ecclesiast (Astral) +Protoss Tritius (Astral) Terran Morrigan (Upstart) Terran Ajax (Futurist) Askosi Dorminge diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 4d0cf709..4a99d5db 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 520490ae..dd276506 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index c5b1ad84..513da2c3 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 6cd485df..86bf19aa 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index c0ea7829..23459d8e 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -12807,10 +12807,14 @@ WarpIn ServitorWarpIn # ----------------------------------------------------------------------------- # ServitorInit: - imgul 1661 0 7 # Servitor shadow (cm\protoss\servitor.grp) + imgulnextid 0 0 # Servitor shadow (cm\protoss\servitor.grp) goto InfestedTerranWalkingToIdle ServitorWalkingToIdle: + playfram 0x00 + goto ServitorHover + +ServitorHover: setvertpos 0 wait 8 setvertpos 0 @@ -12819,7 +12823,7 @@ ServitorWalkingToIdle: wait 8 setvertpos 0 wait 8 - goto ServitorWalkingToIdle + goto ServitorHover ServitorDeath: playsnd 533 # Protoss\Aurora\PScDth00.WAV @@ -12841,7 +12845,7 @@ ServitorUnused1: goto ServitorWalkingToIdle ServitorGndAttkInit: - playfram 0x11 + playfram 0x20 playsndbtwn 2167 2171 # Servitor weaponfire 01, 02, 03, 04, 05 attackwith 1 wait 2 @@ -12852,7 +12856,18 @@ ServitorGndAttkInit: ServitorWalking: setvertpos 0 - goto InfestedTerranWalkingToIdle + goto ServitorWalkingLoop + +ServitorWalkingLoop: + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + wait 1 + goto ServitorWalkingLoop ServitorWarpIn: imgol 2135 0 0 # Servitor Warp Flash (cm\protoss\servitor.grp) diff --git a/mpq/unit/cm/p/gladius-attack.lol b/mpq/unit/cm/p/gladius-attack.lol new file mode 100644 index 00000000..c6c27a1a Binary files /dev/null and b/mpq/unit/cm/p/gladius-attack.lol differ diff --git a/mpq/unit/cm/p/gladius-engine.grp b/mpq/unit/cm/p/gladius-engine.grp index 029cf568..b1a506da 100644 Binary files a/mpq/unit/cm/p/gladius-engine.grp and b/mpq/unit/cm/p/gladius-engine.grp differ diff --git a/mpq/unit/cm/p/gladius.grp b/mpq/unit/cm/p/gladius.grp index 6db291ee..bef37412 100644 Binary files a/mpq/unit/cm/p/gladius.grp and b/mpq/unit/cm/p/gladius.grp differ diff --git a/mpq/unit/cm/p/servitor-shadow.grp b/mpq/unit/cm/p/servitor-shadow.grp new file mode 100644 index 00000000..d59dee6f Binary files /dev/null and b/mpq/unit/cm/p/servitor-shadow.grp differ diff --git a/mpq/unit/cm/p/servitor.grp b/mpq/unit/cm/p/servitor.grp index 0a32ae55..dc294410 100644 Binary files a/mpq/unit/cm/p/servitor.grp and b/mpq/unit/cm/p/servitor.grp differ diff --git a/mpq/unit/cm/p/starsovereign-engine.grp b/mpq/unit/cm/p/starsovereign-engine.grp index 102d37f7..a05c55a3 100644 Binary files a/mpq/unit/cm/p/starsovereign-engine.grp and b/mpq/unit/cm/p/starsovereign-engine.grp differ diff --git a/mpq/unit/cm/p/starsovereign.grp b/mpq/unit/cm/p/starsovereign.grp index 1846ed68..e8ac12f2 100644 Binary files a/mpq/unit/cm/p/starsovereign.grp and b/mpq/unit/cm/p/starsovereign.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index cfc31d79..52b5f745 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index efe27f35..83024037 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index 7ac5fcf5..aabfcf2e 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -11,7 +11,7 @@ # Core ## User Interface -- Added more desync logging (c. Veeq7) +- Improved server-side desync logging (c. Veeq7) - Added user-configurable window flash for when another player joins your lobby (c. Jesse) - Reorganized replay options to `Misc` tab (c. Jesse) - Added user-configurable Askosi player color preferences @@ -52,8 +52,9 @@ ## Audiovisuals - Updated Askosi UI to be GREEN! (c. DF) - Updated background graphics for Options and CrownLink Join menus (c. Jesse) +- Updated engine graphic for Star Sovereign (c. Solstice) - New models for: - - Eidolon (c. Solstice) + - Eidolon, Gladius (c. Solstice) - Valkyrie, Trojan, Amaranth, Atreus, Exemplar, Zethrokor, Hydralisk (c. Baelethal) - Eidolon (Nydus), Valkyrie (Hecaton), Inzorthrokor (Imicren), Sovrokor (Goszirith), Hydralisk (Orkoti), Iziralisk (Zorthos) - New death SFX for: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 2b43a10a..6f600e12 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ