diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d24ec778..54041e9e 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 170e0815..19414db5 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 6c59e9a3..ab5479bd 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1221,7 +1221,7 @@ Architect Architect Shadow Architect Engines Kalkalisk Birth (Cocoon) -Iroleth Birth +Iroleth Birth (Cocoon) Nathrokor Birth Alkajelisk Birth Shaman (Support Mode) @@ -1835,8 +1835,8 @@ Okrimnilisk Birth Axitrilisk Birth Tosgrilisk Birth (Egg) Tosgrilisk Birth (Cocoon) -Extended Image #835 -Extended Image #836 +Iroleth Birth (Egg) +Tetcaerokor Birth (Egg) Extended Image #837 Extended Image #838 Extended Image #839 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 4ae8c4f0..8f359d17 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 0bafddd7..86ad6d9b 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3061,20 +3061,20 @@ Exemplar Weaponhit 03 Vassal Death 01 Vassal Death 02 Vassal Death 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 -Extended Sound #1 +Amaranth Weaponhit 01 +Amaranth Weaponhit 02 +Amaranth Weaponhit 03 +Amaranth Weaponhit 04 +Cataphract Death 01 +Cataphract Death 02 +Cataphract Death 03 +Cataphract Death 04 +Cataphract Death 05 +Cataphract Death 06 +Cataphract Death 07 +Ancile Death 01 +Ancile Death 02 +Ancile Death 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 388fcf3b..260bef47 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3060,4 +3060,18 @@ cm\p\exemplar\wh-02.wav cm\p\exemplar\wh-03.wav cm\p\vassal\dth-01.wav cm\p\vassal\dth-02.wav -cm\p\vassal\dth-03.wav \ No newline at end of file +cm\p\vassal\dth-03.wav +cm\p\amaranth\wh-01.wav +cm\p\amaranth\wh-02.wav +cm\p\amaranth\wh-03.wav +cm\p\amaranth\wh-04.wav +cm\t\cataphract\dth-01.wav +cm\t\cataphract\dth-02.wav +cm\t\cataphract\dth-03.wav +cm\t\cataphract\dth-04.wav +cm\t\cataphract\dth-05.wav +cm\t\cataphract\dth-06.wav +cm\t\cataphract\dth-07.wav +cm\t\ancile\dth-01.wav +cm\t\ancile\dth-02.wav +cm\t\ancile\dth-03.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index e572a100..30c2a630 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 0944fd8f..88b588cf 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -29224,12 +29224,12 @@ AmaranthGndAttkRpt: wait 1 playfram 0x55 playsndbtwn 1231 1234 # Amaranth weaponfire 01, 02, 03, 04 - attackmelee 1 664 # Protoss\ZEALOT\pzeHit00.WAV + attackmelee 4 3063 3064 3065 3066 # Amaranth weaponhit 01, 02, 03, 04 wait 1 playfram 0x66 wait 1 playfram 0x77 - attackmelee 1 664 # Protoss\ZEALOT\pzeHit00.WAV + attackmelee 4 3063 3064 3065 3066 # Amaranth weaponhit 01, 02, 03, 04 wait 1 playfram 0x88 nobrkcodeend @@ -44639,7 +44639,7 @@ AncileGndAttkToIdle: goto AncileGndAttkToIdle AncileDeath: - playsnd 257 # Terran\PHOENIX\TPhDth00.WAV + playsndbtwn 3074 3076 # Ancile death 01, 02, 03 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 lowsprul 845 0 42 # Terran Unit Rubble Small @@ -47174,7 +47174,7 @@ CataphractLocal00: goto CataphractLocal00 CataphractDeath: - playsnd 2820 # Goliath death 01 + playsndbtwn 3067 3073 # Cataphract death 01, 02, 03, 04, 05, 06, 07 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 lowsprul 273 0 0 # Terran Building Rubble Small @@ -47549,11 +47549,9 @@ SpecialState1 [NONE] TetcaerokorInit: imgul 1594 0 42 # Tetcaerokor Shadow (cm\zerg\tetcaerokor.grp) - playfram 0x00 + playfram 0x20 wait 2 TetcaerokorWalkingToIdle: - playfram 0x20 - wait 2 playfram 0x40 wait 2 playfram 0x60 @@ -47570,10 +47568,10 @@ TetcaerokorWalkingToIdle: wait 2 playfram 0x120 wait 2 - playfram 0x140 - wait 2 playfram 0x00 wait 2 + playfram 0x20 + wait 2 goto TetcaerokorWalkingToIdle TetcaerokorDeath: @@ -47651,8 +47649,6 @@ TetcaerokorWalking: wait 1 playfram 0x120 wait 1 - playfram 0x140 - wait 1 playfram 0x00 wait 1 goto TetcaerokorWalking diff --git a/mpq/sound/cm/desktop.ini b/mpq/sound/cm/desktop.ini new file mode 100644 index 00000000..7888d7b3 --- /dev/null +++ b/mpq/sound/cm/desktop.ini @@ -0,0 +1,4 @@ +[ViewState] +Mode= +Vid= +FolderType=Music diff --git a/mpq/sound/cm/p/amaranth/wh-01.wav b/mpq/sound/cm/p/amaranth/wh-01.wav new file mode 100644 index 00000000..ed903aa2 Binary files /dev/null and b/mpq/sound/cm/p/amaranth/wh-01.wav differ diff --git a/mpq/sound/cm/p/amaranth/wh-02.wav b/mpq/sound/cm/p/amaranth/wh-02.wav new file mode 100644 index 00000000..d3510495 Binary files /dev/null and b/mpq/sound/cm/p/amaranth/wh-02.wav differ diff --git a/mpq/sound/cm/p/amaranth/wh-03.wav b/mpq/sound/cm/p/amaranth/wh-03.wav new file mode 100644 index 00000000..22a88605 Binary files /dev/null and b/mpq/sound/cm/p/amaranth/wh-03.wav differ diff --git a/mpq/sound/cm/p/amaranth/wh-04.wav b/mpq/sound/cm/p/amaranth/wh-04.wav new file mode 100644 index 00000000..946b8e2f Binary files /dev/null and b/mpq/sound/cm/p/amaranth/wh-04.wav differ diff --git a/mpq/sound/cm/t/ancile/dth-01.wav b/mpq/sound/cm/t/ancile/dth-01.wav new file mode 100644 index 00000000..3c101194 Binary files /dev/null and b/mpq/sound/cm/t/ancile/dth-01.wav differ diff --git a/mpq/sound/cm/t/ancile/dth-02.wav b/mpq/sound/cm/t/ancile/dth-02.wav new file mode 100644 index 00000000..859b8b0b Binary files /dev/null and b/mpq/sound/cm/t/ancile/dth-02.wav differ diff --git a/mpq/sound/cm/t/ancile/dth-03.wav b/mpq/sound/cm/t/ancile/dth-03.wav new file mode 100644 index 00000000..b7b84c4e Binary files /dev/null and b/mpq/sound/cm/t/ancile/dth-03.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-01.wav b/mpq/sound/cm/t/cataphract/dth-01.wav new file mode 100644 index 00000000..cba88a65 Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-01.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-02.wav b/mpq/sound/cm/t/cataphract/dth-02.wav new file mode 100644 index 00000000..133bd27e Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-02.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-03.wav b/mpq/sound/cm/t/cataphract/dth-03.wav new file mode 100644 index 00000000..d425d779 Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-03.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-04.wav b/mpq/sound/cm/t/cataphract/dth-04.wav new file mode 100644 index 00000000..1c941808 Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-04.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-05.wav b/mpq/sound/cm/t/cataphract/dth-05.wav new file mode 100644 index 00000000..f94eeec9 Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-05.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-06.wav b/mpq/sound/cm/t/cataphract/dth-06.wav new file mode 100644 index 00000000..65b842e3 Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-06.wav differ diff --git a/mpq/sound/cm/t/cataphract/dth-07.wav b/mpq/sound/cm/t/cataphract/dth-07.wav new file mode 100644 index 00000000..c9c2104a Binary files /dev/null and b/mpq/sound/cm/t/cataphract/dth-07.wav differ diff --git a/mpq/unit/cm/protoss/amaranth.grp b/mpq/unit/cm/protoss/amaranth.grp index 2d365fa6..25f24acb 100644 Binary files a/mpq/unit/cm/protoss/amaranth.grp and b/mpq/unit/cm/protoss/amaranth.grp differ diff --git a/mpq/unit/cm/zerg/axitrilisk-birth-single.grp b/mpq/unit/cm/zerg/axitrilisk-birth-single.grp new file mode 100644 index 00000000..592936db Binary files /dev/null and b/mpq/unit/cm/zerg/axitrilisk-birth-single.grp differ diff --git a/mpq/unit/cm/zerg/iroleth-birth.grp b/mpq/unit/cm/zerg/iroleth-birth.grp new file mode 100644 index 00000000..96e08064 Binary files /dev/null and b/mpq/unit/cm/zerg/iroleth-birth.grp differ diff --git a/mpq/unit/cm/zerg/tetcaerokor-birth.grp b/mpq/unit/cm/zerg/tetcaerokor-birth.grp new file mode 100644 index 00000000..b25c6ea6 Binary files /dev/null and b/mpq/unit/cm/zerg/tetcaerokor-birth.grp differ diff --git a/patchnotes.md b/patchnotes.md index 7554fa17..273929e1 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -36,15 +36,16 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues - Added reads for: - Vilgoleth (corpse consumption proc) - Added birth animations for: - - Tosgrilisk, Ghitorokor, Axitrilisk (WIP), Cherbrathalor, Okrimnilisk -- Updated death animations for: - - Golem, Idol + - Iroleth (from egg), Tosgrilisk, Ghitorokor, Axitrilisk (WIP), Cherbrathalor, Okrimnilisk, Tetcaerokor +- Updated visuals for: + - Amaranth attack sequence + - Golem, Idol death animations - Updated SFX for: - Terran addon construction - Golem death - Added new SFX for: - - Vassal, Idol, Empyrean death - - Exemplar weaponhit + - Ancile, Cataphract, Vassal, Idol, Empyrean death + - Amaranth, Exemplar weaponhit ## Protoss - [Ecclesiast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ecclesiast): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 11b0aeb9..1959dae5 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ