diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 05ee8b17..3c342851 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index af792fb3..ce2f8236 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -702,7 +702,7 @@ Scralia Endbore Electricity Rozirokor Zytryleth -Extended Flingy #496 +Camazotz Extended Flingy #497 Extended Flingy #498 Extended Flingy #499 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 7225b800..843229c3 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 7f5efd30..8d3d4c55 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 bd7ea05c..482de530 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2411,8 +2411,8 @@ Grimoire Shadow Zytryleth Zytryleth Shadow Inzorthrokor Mutate -Extended Image #1411 -Extended Image #1412 +Camazotz +Camazotz Shadow Extended Image #1413 Extended Image #1414 Extended Image #1415 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index a09a9f0c..8558fa30 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4259,14 +4259,14 @@ Domain Passive 03 Striga Death 01 Striga Death 02 Striga 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 +Camazotz Weaponfire 01 +Camazotz Weaponfire 02 +Camazotz Weaponfire 03 +Rozirokor Weaponfire 01 +Rozirokor Weaponfire 02 +Rozirokor Weaponhit 01 +Rozirokor Weaponhit 02 +Rozirokor Weaponhit 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 794e56f6..19040c0b 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4258,4 +4258,12 @@ cm\a\domain\pas-02.wav cm\a\domain\pas-03.wav cm\t\striga\dth-01.wav cm\t\striga\dth-02.wav -cm\t\striga\dth-03.wav \ No newline at end of file +cm\t\striga\dth-03.wav +cm\f-t\camazotz\wf-01.wav +cm\f-t\camazotz\wf-02.wav +cm\f-t\camazotz\wf-03.wav +cm\f-z\rozirokor\wf-01.wav +cm\f-z\rozirokor\wf-02.wav +cm\f-z\rozirokor\wh-01.wav +cm\f-z\rozirokor\wh-02.wav +cm\f-z\rozirokor\wh-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 2abe2cdf..6496a2c2 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 3554dacb..a04eb597 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1161,7 +1161,7 @@ Pilgrim Remnants Rozirokor Rozirokor Remains Zytryleth -Extended Sprite #647 +Camazotz Extended Sprite #648 Extended Sprite #649 Extended Sprite #650 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 8570f634..7e43aae5 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 85fed549..f30f9dbe 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -618,7 +618,7 @@ Zerg Rozirokor (Imicren) Bloodsummon Thrombocyte Bloodsummon Grimoire Zerg Zytryleth (Zorthos) -Extended Unit #393 +Terran Camazotz (Nydus Trinity) Extended Unit #394 Extended Unit #395 Extended Unit #396 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index dceed0e6..6568ceaf 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index cccc40c6..aa34e5b4 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 64d7f80d..1827d353 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 5e1b3d3a..73ca8446 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -1336,8 +1336,8 @@ Must target units with energy.<0> <0> <0> <0> -<0> -<0> +¤<3><4>Tragyle's Coagulants <2>(passive)<10>Victims of the Camazotz's attacks react favorably to the serum within, and bleed a miasma that restores 3 HP to allies of the Harakan within 2 range.<0> +f<1><4>Train Camazotz <1>(<3>F<1>)<10>Sustaining infantry.<0> ¤<3><4>Seething Dominion <2>(passive)<10>Zytryleths cannot move once hatched, and launch their Omnispores at all targets within their weapon range.<0> Rozirokor requires:<10> Hydrith Den<0> z<1><4>Morph to Izirokor <1>(<3>Z<1>)<10>Close-combat strain.<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 25b0a76d..01288219 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 0454399f..dc45ec7e 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 deac86ec..e7fa94e5 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -20821,4 +20821,184 @@ CivilianDeathInit: wait 2 lowsprul 1158 0 0 # Civilian Remnants (terran\civilian-remains.grp) wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 226 Camazotz (cm\f-t\camazotz.grp) +.headerstart +IsId 847 +Type 12 +Init CamazotzInit +Death CamazotzDeath +GndAttkInit CamazotzGndAttkInit +AirAttkInit [NONE] +Unused1 CamazotzUnused1 +GndAttkRpt CamazotzGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle CamazotzGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking CamazotzWalking +WalkingToIdle CamazotzWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +CamazotzInit: + imgulnextid 0 0 # Camazotz Shadow (cm\f-t\camazotz-shadow.grp) +CamazotzWalkingToIdle: + playfram 0x40 +CamazotzLocal00: + wait 63 + randcondjmp 25 CamazotzLocal01 + randcondjmp 128 CamazotzLocal02 + goto CamazotzLocal00 + +CamazotzLocal01: + playfram 0x00 + wait 1 + randcondjmp 192 CamazotzLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto CamazotzWalkingToIdle + +CamazotzLocal03: + wait 13 + goto CamazotzWalkingToIdle + +CamazotzLocal02: + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + turnrand 3 + wait 1 + playfram 0x60 + wait 1 + goto CamazotzWalkingToIdle + +CamazotzDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + setfldirect 0 +# playfram 170 + wait 2 +# playfram 171 + wait 2 +# playfram 172 + wait 2 +# playfram 173 + wait 2 +# playfram 174 +# wait 2 +# playfram 175 +# wait 2 +# playfram 176 +# wait 2 +# playfram 177 +# wait 2 + lowsprul 615 0 0 # Camazotz Remnants (cm\terran\camazotz-remnants.grp) + wait 1 + end + +CamazotzUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 # Camazotz revive 01, 02, 03 + sprol 742 0 0 # Explosion Small Reversed +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto CamazotzWalkingToIdle + +CamazotzGndAttkInit: + playfram 0x00 +CamazotzGndAttkRpt: + wait 1 + nobrkcodestart + playsndbtwn 4261 4263 # Camazotz weaponfire 01, 02, 03 + imgoluselo 2056 0 0 # Green projection attack + playfram 0x20 + sigorder 32 + wait 1 + attkshiftproj 52 + sigorder 32 + wait 1 + attkshiftproj 80 + sigorder 32 + wait 5 + playfram 0x00 + wait 2 + ignorerest +CamazotzGndAttkToIdle: + goto CamazotzWalkingToIdle + +CamazotzWalking: + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x40 + goto CamazotzWalking \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index c9b48909..22bf01f1 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index adec5e74..64b2fa2d 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -18456,12 +18456,12 @@ RozirokorGndAttkInit: RozirokorGndAttkRpt: wait 1 nobrkcodestart - playsndbtwn 3141 3144 # Tethzorokor weaponfire 01, 02, 03, 04 + playsndbtwn 4264 4265 # Rozirokor weaponfire 01, 02 wait 1 playfram 0xBB wait 1 playfram 0xCC - attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + attackmelee 2 4266 4268 # Rozirokor weaponhit 01, 02, 03 wait 2 playfram 0xDD wait 2 diff --git a/mpq/sound/cm/f-t/camazotz/wf-01.wav b/mpq/sound/cm/f-t/camazotz/wf-01.wav new file mode 100644 index 00000000..09fb5dad Binary files /dev/null and b/mpq/sound/cm/f-t/camazotz/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/camazotz/wf-02.wav b/mpq/sound/cm/f-t/camazotz/wf-02.wav new file mode 100644 index 00000000..e97c45fd Binary files /dev/null and b/mpq/sound/cm/f-t/camazotz/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/camazotz/wf-03.wav b/mpq/sound/cm/f-t/camazotz/wf-03.wav new file mode 100644 index 00000000..232f09b4 Binary files /dev/null and b/mpq/sound/cm/f-t/camazotz/wf-03.wav differ diff --git a/mpq/sound/cm/f-z/rozirokor/wf-01.wav b/mpq/sound/cm/f-z/rozirokor/wf-01.wav new file mode 100644 index 00000000..2bcd6f23 Binary files /dev/null and b/mpq/sound/cm/f-z/rozirokor/wf-01.wav differ diff --git a/mpq/sound/cm/f-z/rozirokor/wf-02.wav b/mpq/sound/cm/f-z/rozirokor/wf-02.wav new file mode 100644 index 00000000..6893361a Binary files /dev/null and b/mpq/sound/cm/f-z/rozirokor/wf-02.wav differ diff --git a/mpq/sound/cm/f-z/rozirokor/wh-01.wav b/mpq/sound/cm/f-z/rozirokor/wh-01.wav new file mode 100644 index 00000000..2bf6f9b5 Binary files /dev/null and b/mpq/sound/cm/f-z/rozirokor/wh-01.wav differ diff --git a/mpq/sound/cm/f-z/rozirokor/wh-02.wav b/mpq/sound/cm/f-z/rozirokor/wh-02.wav new file mode 100644 index 00000000..ff282f52 Binary files /dev/null and b/mpq/sound/cm/f-z/rozirokor/wh-02.wav differ diff --git a/mpq/sound/cm/f-z/rozirokor/wh-03.wav b/mpq/sound/cm/f-z/rozirokor/wh-03.wav new file mode 100644 index 00000000..5d629a50 Binary files /dev/null and b/mpq/sound/cm/f-z/rozirokor/wh-03.wav differ diff --git a/mpq/unit/cm/f-t/camazotz-shadow.grp b/mpq/unit/cm/f-t/camazotz-shadow.grp new file mode 100644 index 00000000..765f8cf2 Binary files /dev/null and b/mpq/unit/cm/f-t/camazotz-shadow.grp differ diff --git a/mpq/unit/cm/f-t/camazotz.grp b/mpq/unit/cm/f-t/camazotz.grp new file mode 100644 index 00000000..f3ca03b5 Binary files /dev/null and b/mpq/unit/cm/f-t/camazotz.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index b96aab71..7ae051c3 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 4a25ac92..e8810eba 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 0b350561..22e5dda7 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 1b6c0d9c..6c4478e2 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 7f81c384..afbabd04 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -64,6 +64,8 @@ - Resource costs 150/225 » 200/150 - [Broadside](https://cosmonarchy.com/terran/broadside): - HP 300 » 335 +- **NEW:** [Camazotz](https://cosmonarchy.com/terran/camazotz): + - **Nydus Trinity:** Harakan replacement. Sustaining infantry. ## Protoss - [Artisan](https://cosmonarchy.com/protoss/artisan): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 2c9ac03f..369efa41 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ