diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 18b6d54f..a9b745a6 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 35d34223..0fb8607b 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3859,12 +3859,12 @@ Herald Under Attack 01 Herald Under Attack 02 Herald Under Attack 03 Herald Under Attack 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Optecton Winddown 01 +Optecton Winddown 02 +Optecton Winddown 03 +Autocrat Windup 01 +Autocrat Windup 02 +Autocrat Windup 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a1d55c81..ea714acd 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3858,4 +3858,10 @@ cm\p\herald\agg-04.wav cm\p\herald\hlp-01.wav cm\p\herald\hlp-02.wav cm\p\herald\hlp-03.wav -cm\p\herald\hlp-04.wav \ No newline at end of file +cm\p\herald\hlp-04.wav +cm\p\optecton\winddown-01.wav +cm\p\optecton\winddown-02.wav +cm\p\optecton\winddown-03.wav +cm\t\autocrat\windup-01.wav +cm\t\autocrat\windup-02.wav +cm\t\autocrat\windup-03.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index e271cdab..379aa410 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 578d0f97..6bf1047d 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index d237d48e..cdb99d9a 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 b4c42c0a..1304cf34 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -13251,6 +13251,8 @@ OptectonGndAttkRpt: wait 8 imgol 1820 0 0 # Architect charge overlay wait 8 + imgol 1820 0 0 # Architect charge overlay + wait 11 playfram 0x220 imgoluselo 1855 0 0 # Optecton muzzle flash playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 @@ -13335,10 +13337,13 @@ OptectonGndAttkRpt: wait 1 playfram 0x240 wait 3 + playsndbtwn 3861 3863 # Optecton winddown 01, 02, 03 playfram 0x260 wait 1 playfram 0x00 wait 1 + imgol 1820 0 0 # Architect charge overlay + wait 24 nobrkcodeend gotorepeatattk ignorerest diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index a8257f07..f97e16e6 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 41bda346..e53754f1 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -13129,10 +13129,19 @@ AutocratDeath: AutocratGndAttkInit: playfram 0xaa + wait 1 + sigorder 32 + wait 22 AutocratGndAttkRpt: wait 2 nobrkcodestart - playsndbtwn 1474 1478 + playsndbtwn 1474 1478 # Autocrat weaponfire 01 + attack + playfram 0x99 + wait 1 + playfram 0xaa + wait 3 + playsndbtwn 1474 1478 # Autocrat weaponfire 01 attack playfram 0x99 wait 1 diff --git a/mpq/sound/cm/p/optecton/winddown-01.wav b/mpq/sound/cm/p/optecton/winddown-01.wav new file mode 100644 index 00000000..76620f84 Binary files /dev/null and b/mpq/sound/cm/p/optecton/winddown-01.wav differ diff --git a/mpq/sound/cm/p/optecton/winddown-02.wav b/mpq/sound/cm/p/optecton/winddown-02.wav new file mode 100644 index 00000000..a5528aa7 Binary files /dev/null and b/mpq/sound/cm/p/optecton/winddown-02.wav differ diff --git a/mpq/sound/cm/p/optecton/winddown-03.wav b/mpq/sound/cm/p/optecton/winddown-03.wav new file mode 100644 index 00000000..fd92a00b Binary files /dev/null and b/mpq/sound/cm/p/optecton/winddown-03.wav differ diff --git a/mpq/sound/cm/t/autocrat/windup-01.wav b/mpq/sound/cm/t/autocrat/windup-01.wav new file mode 100644 index 00000000..85700162 Binary files /dev/null and b/mpq/sound/cm/t/autocrat/windup-01.wav differ diff --git a/mpq/sound/cm/t/autocrat/windup-02.wav b/mpq/sound/cm/t/autocrat/windup-02.wav new file mode 100644 index 00000000..42cdf803 Binary files /dev/null and b/mpq/sound/cm/t/autocrat/windup-02.wav differ diff --git a/mpq/sound/cm/t/autocrat/windup-03.wav b/mpq/sound/cm/t/autocrat/windup-03.wav new file mode 100644 index 00000000..f4deefeb Binary files /dev/null and b/mpq/sound/cm/t/autocrat/windup-03.wav differ diff --git a/mpq/tileset/AshWorld.cv5 b/mpq/tileset/AshWorld.cv5 index c3e600bc..da060c6c 100644 Binary files a/mpq/tileset/AshWorld.cv5 and b/mpq/tileset/AshWorld.cv5 differ diff --git a/mpq/tileset/AshWorld.vf4 b/mpq/tileset/AshWorld.vf4 index 4eba1dfc..c8c1ed57 100644 Binary files a/mpq/tileset/AshWorld.vf4 and b/mpq/tileset/AshWorld.vf4 differ diff --git a/mpq/tileset/AshWorld.vr4 b/mpq/tileset/AshWorld.vr4 index 91e1b733..a9b4242b 100644 Binary files a/mpq/tileset/AshWorld.vr4 and b/mpq/tileset/AshWorld.vr4 differ diff --git a/mpq/tileset/AshWorld.vx4ex b/mpq/tileset/AshWorld.vx4ex index b84c52a0..036e9838 100644 Binary files a/mpq/tileset/AshWorld.vx4ex and b/mpq/tileset/AshWorld.vx4ex differ diff --git a/mpq/tileset/ice.cv5 b/mpq/tileset/ice.cv5 index 991719f3..843f5dc1 100644 Binary files a/mpq/tileset/ice.cv5 and b/mpq/tileset/ice.cv5 differ diff --git a/mpq/tileset/ice.vf4 b/mpq/tileset/ice.vf4 index 0537375c..af1a81c6 100644 Binary files a/mpq/tileset/ice.vf4 and b/mpq/tileset/ice.vf4 differ diff --git a/mpq/tileset/ice.vr4 b/mpq/tileset/ice.vr4 index 54e5684d..e5e73eb9 100644 Binary files a/mpq/tileset/ice.vr4 and b/mpq/tileset/ice.vr4 differ diff --git a/mpq/tileset/ice.vx4ex b/mpq/tileset/ice.vx4ex index 96d5c02c..c0cb42f6 100644 Binary files a/mpq/tileset/ice.vx4ex and b/mpq/tileset/ice.vx4ex differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index dd0aa88c..d5e9113f 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 9ef6cfad..8537b32f 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 98044769..8591c147 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index f4265256..b35ae4f7 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index bdc0cd21..c614a250 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -12,8 +12,29 @@ - Reinstated weaponhit VFX for **Cyclops - Brontes Payload** ## Audiovisuals -- New models for: +- New model for: + - **Herald** (c. Solstice) +- New portrait for: - **Herald** (c. Solstice) - New unit responses for: - **Azazel** (c. GreenEggs'NSpam) - - **Herald** \ No newline at end of file + - **Herald** + +## Terran +- [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): + - **Eminence Rifle:** + - Now has an attack windup of 1 second + - Weapon damage 15 » 8 + - Weapon factor 1 » 2 + - **Kinetic Penetration** replaced with **Prolonged Arms** (interception without penetration) + +## Protoss +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - **Sunsplit Beam:** + - Attack windup duration 1.5 » 2 + - Now has an attack winddown of 1 second + +## Zerg +- [Ghitorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ghitorokor): + - Resource costs 150/75 » 150/50 + - Now leads targets like other melee air units \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a06ed31f..e43aed19 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ