diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index c7dce320..6eb5d3a1 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 b403621f..81a86436 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 db8e7648..4a81e02e 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3635,19 +3635,19 @@ Protoss Unit Deployment 04 Optecton Windup 01 Optecton Windup 02 Optecton Windup 03 -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 +Grand Library Ambient 01 +Rogue Gallery Ambient 01 +Prostration Stage Ambient 01 +Ancestral Archives Ambient 01 +Ardent Authority Ambient 01 +Unitary Union Ambient 01 +Synthetic Synod Ambient 01 +Argosy Ambient 01 +Monument of Sin Ambient 01 +Larva Spawn 01 +Larva Spawn 02 +Larva Spawn 03 +Ancestral Archives What 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 92a8f312..342f9b8c 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1763,11 +1763,11 @@ cm\t\_building\scrapyard.wav cm\t\_building\tinkerers-tower.wav cm\p\_building\astral-omen.wav cm\p\_building\crucible\wht-01.wav -cm\p\_building\grand-library.wav -cm\p\_building\monument-of-sin.wav +cm\p\_building\grand-library\wht-01.wav +cm\p\_building\monument-of-sin\wht-01.wav cm\p\_building\pennant.wav cm\p\_building\sanctum-of-sorrow.wav -cm\p\_building\synthetic-synod.wav +cm\p\_building\synthetic-synod\wht-01.wav cm\p\_building\wayward-lure.wav cm\z\_building\alaszil-arbor.wav cm\z\_building\gorgral-swamp.wav @@ -2151,7 +2151,7 @@ cm\t\pegasus\wfa-04.wav cm\t\_building\mantle.wav cm\t\_building\captaincy.wav cm\t\_building\apothecary.wav -cm\p\_building\rogue-gallery.wav +cm\p\_building\rogue-gallery\wht-01.wav cm\p\_building\sequestered-icon.wav cm\z\spraith\wf-01.wav cm\z\spraith\wf-02.wav @@ -2674,9 +2674,9 @@ cm\p\scribe\wf-03.wav cm\p\dracadin\wh-01.wav cm\p\dracadin\wh-02.wav cm\p\dracadin\wh-03.wav -cm\p\_building\ardent-authority.wav -cm\p\_building\argosy.wav -cm\p\_building\prostration-stage.wav +cm\p\_building\ardent-authority\wht-01.wav +cm\p\_building\argosy\wht-01.wav +cm\p\_building\prostration-stage\wht-01.wav cm\t\_building\hadron.wav cm\advisors\hadral\hadralad_addon-01.wav cm\advisors\hadral\hadralad_allyattack-a-01.wav @@ -3634,4 +3634,17 @@ cm\p\_building\p-unit-deploy-03.wav cm\p\_building\p-unit-deploy-04.wav cm\p\optecton\windup-01.wav cm\p\optecton\windup-02.wav -cm\p\optecton\windup-03.wav \ No newline at end of file +cm\p\optecton\windup-03.wav +cm\p\_building\grand-library\amb-01.wav +cm\p\_building\rogue-gallery\amb-01.wav +cm\p\_building\prostration-stage\amb-01.wav +cm\p\_building\ancestral-archives\amb-01.wav +cm\p\_building\ardent-authority\amb-01.wav +cm\p\_building\unitary-union\amb-01.wav +cm\p\_building\synthetic-synod\amb-01.wav +cm\p\_building\argosy\amb-01.wav +cm\p\_building\monument-of-sin\amb-01.wav +cm\z\larva\spawn-01.wav +cm\z\larva\spawn-02.wav +cm\z\larva\spawn-03.wav +cm\p\_building\ancestral-archives\wht-01.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index df6a7a0b..ac345c62 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 746448bf..a96424e0 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 914d9cf8..5df171e5 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index d4c32571..8ddd8c25 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -12006,19 +12006,19 @@ AspirantWalkingToIdle: playfram 0x00 wait 1 AspirantLocal00: - playfram 0x11 + playfram 0x20 wait 2 - playfram 0x22 + playfram 0x40 wait 2 - playfram 0x33 + playfram 0x60 wait 2 - playfram 0x44 + playfram 0x80 wait 2 - playfram 0x55 + playfram 0xA0 wait 2 - playfram 0x66 + playfram 0xC0 wait 2 - playfram 0x77 + playfram 0xE0 wait 2 playfram 0x00 wait 2 @@ -12027,19 +12027,19 @@ AspirantLocal00: AspirantDeath: playsndbtwn 1435 1438 # Aspirant death 01, 02, 03, 04 setfldirect 0 - playfram 0x198 + playfram 0x300 wait 2 - playfram 409 + playfram 769 wait 2 - playfram 410 + playfram 770 wait 2 - playfram 411 + playfram 771 wait 2 - playfram 412 + playfram 772 wait 2 - playfram 413 + playfram 773 wait 2 - playfram 414 + playfram 774 wait 2 lowsprul 685 0 0 # Aspirant Remnants (cm\terran\aspirant-death.grp) wait 1 @@ -12050,79 +12050,79 @@ AspirantUnused1: nobrkcodestart playsndbtwn 1435 1438 # Aspirant death 01, 02, 03, 04 setfldirect 0 - playfram 413 + playfram 773 wait 2 - playfram 412 + playfram 772 wait 2 - playfram 411 + playfram 771 wait 2 - playfram 410 + playfram 770 wait 2 - playfram 409 + playfram 769 wait 2 - playfram 0x198 + playfram 0x300 setfldirect 12 nobrkcodeend goto AspirantWalkingToIdle AspirantGndAttkInit: - playfram 0x110 + playfram 0x200 wait 1 - playfram 0x132 + playfram 0x240 wait 1 - playfram 0x154 + playfram 0x280 wait 1 AspirantGndAttkRpt: nobrkcodestart playsndbtwn 1409 1411 # Aspirant weapon fire 01, 02, 03 - playfram 0x176 + playfram 0x2C0 wait 1 - playfram 0x187 + playfram 0x2E0 wait 1 attackwith 1 - playfram 0x176 + playfram 0x2C0 wait 1 - playfram 0x165 + playfram 0x2A0 wait 1 - playfram 0x154 + playfram 0x200 wait 1 - playfram 0x143 + playfram 0x180 wait 1 - playfram 0x77 + playfram 0xE0 nobrkcodeend gotorepeatattk ignorerest AspirantGndAttkToIdle: wait 1 - playfram 0x77 + playfram 0xE0 wait 1 goto AspirantWalkingToIdle AspirantWalking: move 5 wait 1 - playfram 0x88 + playfram 0x100 move 5 wait 1 - playfram 0x99 + playfram 0x120 move 5 wait 1 - playfram 0xaa + playfram 0x140 move 5 wait 1 - playfram 0xbb + playfram 0x160 move 5 wait 1 - playfram 0xcc + playfram 0x180 move 5 wait 1 - playfram 0xdd + playfram 0x1A0 move 5 wait 1 - playfram 0xee + playfram 0x1C0 move 5 wait 1 - playfram 0xff + playfram 0x1E0 goto AspirantWalking AspirantWarpIn: diff --git a/mpq/sound/cm/p/_building/ancestral-archives/amb-01.wav b/mpq/sound/cm/p/_building/ancestral-archives/amb-01.wav new file mode 100644 index 00000000..01bec33b Binary files /dev/null and b/mpq/sound/cm/p/_building/ancestral-archives/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/hall-of-heretics.wav b/mpq/sound/cm/p/_building/ancestral-archives/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/hall-of-heretics.wav rename to mpq/sound/cm/p/_building/ancestral-archives/wht-01.wav diff --git a/mpq/sound/cm/p/_building/ardent-authority/amb-01.wav b/mpq/sound/cm/p/_building/ardent-authority/amb-01.wav new file mode 100644 index 00000000..d945878d Binary files /dev/null and b/mpq/sound/cm/p/_building/ardent-authority/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/ardent-authority.wav b/mpq/sound/cm/p/_building/ardent-authority/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/ardent-authority.wav rename to mpq/sound/cm/p/_building/ardent-authority/wht-01.wav diff --git a/mpq/sound/cm/p/_building/argosy/amb-01.wav b/mpq/sound/cm/p/_building/argosy/amb-01.wav new file mode 100644 index 00000000..51857733 Binary files /dev/null and b/mpq/sound/cm/p/_building/argosy/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/argosy.wav b/mpq/sound/cm/p/_building/argosy/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/argosy.wav rename to mpq/sound/cm/p/_building/argosy/wht-01.wav diff --git a/mpq/sound/cm/p/_building/grand-library/amb-01.wav b/mpq/sound/cm/p/_building/grand-library/amb-01.wav new file mode 100644 index 00000000..5e877fdd Binary files /dev/null and b/mpq/sound/cm/p/_building/grand-library/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/grand-library.wav b/mpq/sound/cm/p/_building/grand-library/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/grand-library.wav rename to mpq/sound/cm/p/_building/grand-library/wht-01.wav diff --git a/mpq/sound/cm/p/_building/lattice/amb-01.wav b/mpq/sound/cm/p/_building/lattice/amb-01.wav index 4cc3e85a..366f3ac1 100644 Binary files a/mpq/sound/cm/p/_building/lattice/amb-01.wav and b/mpq/sound/cm/p/_building/lattice/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/monument-of-sin/amb-01.wav b/mpq/sound/cm/p/_building/monument-of-sin/amb-01.wav new file mode 100644 index 00000000..72e6a491 Binary files /dev/null and b/mpq/sound/cm/p/_building/monument-of-sin/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/monument-of-sin.wav b/mpq/sound/cm/p/_building/monument-of-sin/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/monument-of-sin.wav rename to mpq/sound/cm/p/_building/monument-of-sin/wht-01.wav diff --git a/mpq/sound/cm/p/_building/prostration-stage/amb-01.wav b/mpq/sound/cm/p/_building/prostration-stage/amb-01.wav new file mode 100644 index 00000000..ea7d1d34 Binary files /dev/null and b/mpq/sound/cm/p/_building/prostration-stage/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/prostration-stage.wav b/mpq/sound/cm/p/_building/prostration-stage/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/prostration-stage.wav rename to mpq/sound/cm/p/_building/prostration-stage/wht-01.wav diff --git a/mpq/sound/cm/p/_building/rogue-gallery/amb-01.wav b/mpq/sound/cm/p/_building/rogue-gallery/amb-01.wav new file mode 100644 index 00000000..802d95b2 Binary files /dev/null and b/mpq/sound/cm/p/_building/rogue-gallery/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/rogue-gallery.wav b/mpq/sound/cm/p/_building/rogue-gallery/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/rogue-gallery.wav rename to mpq/sound/cm/p/_building/rogue-gallery/wht-01.wav diff --git a/mpq/sound/cm/p/_building/synthetic-synod/amb-01.wav b/mpq/sound/cm/p/_building/synthetic-synod/amb-01.wav new file mode 100644 index 00000000..0ae6a465 Binary files /dev/null and b/mpq/sound/cm/p/_building/synthetic-synod/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/synthetic-synod.wav b/mpq/sound/cm/p/_building/synthetic-synod/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/synthetic-synod.wav rename to mpq/sound/cm/p/_building/synthetic-synod/wht-01.wav diff --git a/mpq/sound/cm/p/_building/unitary-union.wav b/mpq/sound/cm/p/_building/unitary-union.wav deleted file mode 100644 index 747eb4e8..00000000 Binary files a/mpq/sound/cm/p/_building/unitary-union.wav and /dev/null differ diff --git a/mpq/sound/cm/p/_building/unitary-union/amb-01.wav b/mpq/sound/cm/p/_building/unitary-union/amb-01.wav new file mode 100644 index 00000000..973ea938 Binary files /dev/null and b/mpq/sound/cm/p/_building/unitary-union/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/unitary-union/wht-01.wav b/mpq/sound/cm/p/_building/unitary-union/wht-01.wav new file mode 100644 index 00000000..0766ecdd Binary files /dev/null and b/mpq/sound/cm/p/_building/unitary-union/wht-01.wav differ diff --git a/mpq/sound/cm/z/larva/spawn-01.wav b/mpq/sound/cm/z/larva/spawn-01.wav new file mode 100644 index 00000000..34497de5 Binary files /dev/null and b/mpq/sound/cm/z/larva/spawn-01.wav differ diff --git a/mpq/sound/cm/z/larva/spawn-02.wav b/mpq/sound/cm/z/larva/spawn-02.wav new file mode 100644 index 00000000..b4a63e53 Binary files /dev/null and b/mpq/sound/cm/z/larva/spawn-02.wav differ diff --git a/mpq/sound/cm/z/larva/spawn-03.wav b/mpq/sound/cm/z/larva/spawn-03.wav new file mode 100644 index 00000000..765b19eb Binary files /dev/null and b/mpq/sound/cm/z/larva/spawn-03.wav differ diff --git a/mpq/unit/cm/faction-t/aspirant-shadow.grp b/mpq/unit/cm/faction-t/aspirant-shadow.grp index ed106acf..c021911c 100644 Binary files a/mpq/unit/cm/faction-t/aspirant-shadow.grp and b/mpq/unit/cm/faction-t/aspirant-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/aspirant.grp b/mpq/unit/cm/faction-t/aspirant.grp index 5824c72e..8e1bd3ea 100644 Binary files a/mpq/unit/cm/faction-t/aspirant.grp and b/mpq/unit/cm/faction-t/aspirant.grp differ diff --git a/patchnotes.md b/patchnotes.md index 8851bbc8..dd0ee27d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -17,11 +17,15 @@ - Made 'no corpse' behaviors spawn a consumed corpse for better visual feedback ## Audiovisuals -- New model for: +- New sprite for: - **Autocort** (c. DeltaCadimus) +- Improved sprite for: + - **Aspirant** (c. Mimika) - New SFX for: - - Unit completion (Terran & Protoss) + - Unit completion (Terran, Protoss, Larvae) + - Ambient training SFX (Grand Library, Rogue Gallery, Prostration Stage, Ancestral Archives, Ardent Authority, Unitary Union, Synthetic Synod, Argosy, Monument of Sin) - Attack windup (Optecton) + - Building response (Ancestral Archives) - Modified SFX for: - Ambient training SFX (Ministry, Embassy, Lattice) @@ -34,6 +38,10 @@ - Attack windup 0 » 0.5 seconds - [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant): - Vision range 9 » 7 +- [Olympian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/olympian): + - **Dishonorable Discharge** + - No longer grants bonus armor penetration + - Now grants bonus damage equal to excess armor pen ## Protoss - [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 40997c99..4f2873ee 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ