diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index fa7e2e7a..49b137d3 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 0f2e2f09..58d17797 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -356,7 +356,7 @@ Aspirant Criticality Field Akistrokor Konvilisk Claymore -Gorgral Swamp +Tethvith Swamp Keskathalor Weaponhit Alaszileth Diadem Weaponhit @@ -557,9 +557,9 @@ Tiangou (Turret) Eidolon (Nydus) Maverick (Futurist) Hydralisk (Orkoti) -Extended Flingy #351 -Extended Flingy #352 -Extended Flingy #353 +Tencendur +Inzorthrokor +Manifold (Starbound) Extended Flingy #354 Extended Flingy #355 Extended Flingy #356 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a3aa9cde..74c5a535 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 5f8fb1f9..a31fdd37 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 b38be875..68f6173f 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1361,8 +1361,8 @@ Claymore Claymore Shadow Aion Shadow Scribe Remains -unused -unused +Tethvith Swamp +Tethvith Swamp Shadow Warp Anchor Underlay Alaszileth Alaszileth Shadow @@ -2015,19 +2015,19 @@ Maverick (Futurist) Maverick Shadow (Futurist) Hydralisk (Orkoti) Hydralisk Shadow (Orkoti) -Extended Image #1015 -Extended Image #1016 -Extended Image #1017 -Extended Image #1018 -Extended Image #1019 -Extended Image #1020 -Extended Image #1021 -Extended Image #1022 -Extended Image #1023 -Extended Image #1024 -Extended Image #1025 -Extended Image #1026 -Extended Image #1027 +Tencendur +Tencendur Shadow +Tencendur Attack Overlay (Orange) +Tencendur Attack Overlay (Blue) +Tencendur Attack Overlay (Green) +Hydralisk Remains (Orkoti) +Tencendur Flag +Inzorthrokor +Inzorthrokor Shadow +Inzorthrokor Remains +Inzorthrokor Birth +Manifold (Starbound) +Manifold Shadow (Starbound) Extended Image #1028 Extended Image #1029 Extended Image #1030 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index 4c899bd9..872ec1fd 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl index 3214c718..644f9900 100644 Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index 58b47f72..7c044e34 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -275,7 +275,7 @@ Saberhand Tazarain Sectarian Venammar Actuary Ithintos Justicar Kiraxxar -Extended Portrait #168 +Demiurge Extended Portrait #169 Extended Portrait #170 Extended Portrait #171 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 211eafc1..7f7c0ca2 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 0b5bced9..74a0de15 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3469,11 +3469,11 @@ Ramesses Under Attack 04 Maverick Futurist Weaponfire 01 Maverick Futurist Weaponfire 02 Maverick Futurist Weaponfire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Eidolon Nydus Weaponfire 01 +Eidolon Nydus Weaponfire 02 +Eidolon Nydus Weaponfire 03 +Eidolon Nydus Weaponfire 04 +Eidolon Nydus Weaponfire 05 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a0d23ac0..96726833 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3471,4 +3471,6 @@ cm\f-t\maverick-futurist\wf-02.wav cm\f-t\maverick-futurist\wf-03.wav cm\f-t\eidolon-nydus\wf-01.wav cm\f-t\eidolon-nydus\wf-02.wav -cm\f-t\eidolon-nydus\wf-03.wav \ No newline at end of file +cm\f-t\eidolon-nydus\wf-03.wav +cm\f-t\eidolon-nydus\wf-04.wav +cm\f-t\eidolon-nydus\wf-05.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index f13f2610..c32b6e9d 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 d0a5e425..dafd020c 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -690,7 +690,7 @@ Konvilisk Konvilisk Remnants Claymore Scribe Remnants -Gorgral Swamp +Tethvith Swamp Keskathalor Acid Pool Alaszileth Ion Field @@ -988,14 +988,14 @@ Tiangou (Turret) Eidolon (Nydus) Maverick (Futurist) Hydralisk (Orkoti) -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Tencendur +Tencendur Attack Overlay (Orange) +Tencendur Attack Overlay (Blue) +Tencendur Attack Overlay (Green) +Hydralisk Remains (Orkoti) +Inzorthrokor +Inzorthrokor Remains +Manifold (Starbound) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 97700887..11d3e42f 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 a39aa01f..c9506aad 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -404,7 +404,7 @@ Zerg Nathrelisk (Zorthos) Zerg Iziralisk (Zorthos) Faction Selection Protoss Faction Selection Zerg -Terran Anchor (Grounded) +Terran Trenchfoot Zerg Sasyrvoleth Terran Tencendur Ackmed @@ -435,7 +435,7 @@ Terran Tiangou (Base) Tiangou Turret Terran Maverick (Futurist) Zerg Hydralisk (Orkoti) -Extended Unit #210 +Protoss Manifold (Starbound) Extended Unit #211 Extended Unit #212 Extended Unit #213 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index b1aeb071..ed491871 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index cb286b2b..d5360125 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -235,8 +235,8 @@ Phase Disruptor (Dracadin) Moonbound Salvo (Tiangou) Revenant Rifle (Nydus Eidolon) Gauss Slugger (Maverick Futurist) -Extended Weapon #108 -Extended Weapon #109 +Needle Spores (Hydralisk Orkoti) +Inzor Reflux (Inzorthrokor) Extended Weapon #110 Extended Weapon #111 Extended Weapon #112 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index e924ebcb..6b03d689 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 5a955cfb..63daca58 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 9a6fb87a..db34e0d4 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 8b31a247..5eaa7329 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 a4c226c0..51485904 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/askosi/avatar/fid00.smk b/mpq/portrait/askosi/avatar/fid00.smk index 2e1eaff7..bb51c3b9 100644 Binary files a/mpq/portrait/askosi/avatar/fid00.smk and b/mpq/portrait/askosi/avatar/fid00.smk differ diff --git a/mpq/portrait/askosi/avatar/fid01.smk b/mpq/portrait/askosi/avatar/fid01.smk index f6135026..1b2d12e0 100644 Binary files a/mpq/portrait/askosi/avatar/fid01.smk and b/mpq/portrait/askosi/avatar/fid01.smk differ diff --git a/mpq/portrait/askosi/avatar/fid02.smk b/mpq/portrait/askosi/avatar/fid02.smk index f0a1049f..dc39eb14 100644 Binary files a/mpq/portrait/askosi/avatar/fid02.smk and b/mpq/portrait/askosi/avatar/fid02.smk differ diff --git a/mpq/portrait/askosi/avatar/fid03.smk b/mpq/portrait/askosi/avatar/fid03.smk new file mode 100644 index 00000000..796dc8ef Binary files /dev/null and b/mpq/portrait/askosi/avatar/fid03.smk differ diff --git a/mpq/portrait/askosi/avatar/tlk00.smk b/mpq/portrait/askosi/avatar/tlk00.smk index 4db2e950..eba837bd 100644 Binary files a/mpq/portrait/askosi/avatar/tlk00.smk and b/mpq/portrait/askosi/avatar/tlk00.smk differ diff --git a/mpq/portrait/askosi/avatar/tlk01.smk b/mpq/portrait/askosi/avatar/tlk01.smk index 742b2a44..68708922 100644 Binary files a/mpq/portrait/askosi/avatar/tlk01.smk and b/mpq/portrait/askosi/avatar/tlk01.smk differ diff --git a/mpq/portrait/askosi/avatar/tlk02.smk b/mpq/portrait/askosi/avatar/tlk02.smk new file mode 100644 index 00000000..2c99435e Binary files /dev/null and b/mpq/portrait/askosi/avatar/tlk02.smk differ diff --git a/mpq/portrait/faction/advisor_imicren/fid00.smk b/mpq/portrait/faction/advisor_imicren/fid00.smk index 6b21b0ab..cc12409f 100644 Binary files a/mpq/portrait/faction/advisor_imicren/fid00.smk and b/mpq/portrait/faction/advisor_imicren/fid00.smk differ diff --git a/mpq/portrait/faction/ashguard/fid00.smk b/mpq/portrait/faction/ashguard/fid00.smk index fd8e6014..9ea6ac51 100644 Binary files a/mpq/portrait/faction/ashguard/fid00.smk and b/mpq/portrait/faction/ashguard/fid00.smk differ diff --git a/mpq/portrait/faction/ashguard/fid01.smk b/mpq/portrait/faction/ashguard/fid01.smk index b15dbda2..70f69a27 100644 Binary files a/mpq/portrait/faction/ashguard/fid01.smk and b/mpq/portrait/faction/ashguard/fid01.smk differ diff --git a/mpq/portrait/faction/ashguard/tlk00.smk b/mpq/portrait/faction/ashguard/tlk00.smk index 1d7365b7..4de0ce09 100644 Binary files a/mpq/portrait/faction/ashguard/tlk00.smk and b/mpq/portrait/faction/ashguard/tlk00.smk differ diff --git a/mpq/portrait/faction/ashguard/tlk01.smk b/mpq/portrait/faction/ashguard/tlk01.smk index f8dd74bf..88a2750f 100644 Binary files a/mpq/portrait/faction/ashguard/tlk01.smk and b/mpq/portrait/faction/ashguard/tlk01.smk differ diff --git a/mpq/portrait/protoss/charlatan/fid00.smk b/mpq/portrait/protoss/charlatan/fid00.smk index 74ef2813..06346fe7 100644 Binary files a/mpq/portrait/protoss/charlatan/fid00.smk and b/mpq/portrait/protoss/charlatan/fid00.smk differ diff --git a/mpq/portrait/protoss/charlatan/fid01.smk b/mpq/portrait/protoss/charlatan/fid01.smk index a7ad91ac..dcbf33e3 100644 Binary files a/mpq/portrait/protoss/charlatan/fid01.smk and b/mpq/portrait/protoss/charlatan/fid01.smk differ diff --git a/mpq/portrait/protoss/charlatan/fid02.smk b/mpq/portrait/protoss/charlatan/fid02.smk index 2b6dc9cc..09196dc9 100644 Binary files a/mpq/portrait/protoss/charlatan/fid02.smk and b/mpq/portrait/protoss/charlatan/fid02.smk differ diff --git a/mpq/portrait/protoss/charlatan/fid03.smk b/mpq/portrait/protoss/charlatan/fid03.smk new file mode 100644 index 00000000..291fdbf1 Binary files /dev/null and b/mpq/portrait/protoss/charlatan/fid03.smk differ diff --git a/mpq/portrait/protoss/charlatan/tlk00.smk b/mpq/portrait/protoss/charlatan/tlk00.smk index 6d2fd239..33051d01 100644 Binary files a/mpq/portrait/protoss/charlatan/tlk00.smk and b/mpq/portrait/protoss/charlatan/tlk00.smk differ diff --git a/mpq/portrait/protoss/charlatan/tlk01.smk b/mpq/portrait/protoss/charlatan/tlk01.smk index 41112533..fab30ef2 100644 Binary files a/mpq/portrait/protoss/charlatan/tlk01.smk and b/mpq/portrait/protoss/charlatan/tlk01.smk differ diff --git a/mpq/portrait/protoss/charlatan/tlk02.smk b/mpq/portrait/protoss/charlatan/tlk02.smk index 8557d54a..30370a7e 100644 Binary files a/mpq/portrait/protoss/charlatan/tlk02.smk and b/mpq/portrait/protoss/charlatan/tlk02.smk differ diff --git a/mpq/portrait/protoss/clarion/fid00.smk b/mpq/portrait/protoss/clarion/fid00.smk index f56b216d..f37bb002 100644 Binary files a/mpq/portrait/protoss/clarion/fid00.smk and b/mpq/portrait/protoss/clarion/fid00.smk differ diff --git a/mpq/portrait/protoss/empress/fid00.smk b/mpq/portrait/protoss/empress/fid00.smk index c384dcf8..280b7bb6 100644 Binary files a/mpq/portrait/protoss/empress/fid00.smk and b/mpq/portrait/protoss/empress/fid00.smk differ diff --git a/mpq/portrait/protoss/empress/fid01.smk b/mpq/portrait/protoss/empress/fid01.smk index 12a9b30a..9f821c3a 100644 Binary files a/mpq/portrait/protoss/empress/fid01.smk and b/mpq/portrait/protoss/empress/fid01.smk differ diff --git a/mpq/portrait/protoss/empress/tlk00.smk b/mpq/portrait/protoss/empress/tlk00.smk index ae3d4c94..0db71779 100644 Binary files a/mpq/portrait/protoss/empress/tlk00.smk and b/mpq/portrait/protoss/empress/tlk00.smk differ diff --git a/mpq/portrait/protoss/empress/tlk01.smk b/mpq/portrait/protoss/empress/tlk01.smk new file mode 100644 index 00000000..3b3e83f8 Binary files /dev/null and b/mpq/portrait/protoss/empress/tlk01.smk differ diff --git a/mpq/portrait/protoss/empyrean/fid00.smk b/mpq/portrait/protoss/empyrean/fid00.smk index c1ff78e4..92c08fe0 100644 Binary files a/mpq/portrait/protoss/empyrean/fid00.smk and b/mpq/portrait/protoss/empyrean/fid00.smk differ diff --git a/mpq/portrait/protoss/empyrean/fid01.smk b/mpq/portrait/protoss/empyrean/fid01.smk index 064a5c47..ef8f89f6 100644 Binary files a/mpq/portrait/protoss/empyrean/fid01.smk and b/mpq/portrait/protoss/empyrean/fid01.smk differ diff --git a/mpq/portrait/protoss/empyrean/fid02.smk b/mpq/portrait/protoss/empyrean/fid02.smk new file mode 100644 index 00000000..d6976bbf Binary files /dev/null and b/mpq/portrait/protoss/empyrean/fid02.smk differ diff --git a/mpq/portrait/protoss/empyrean/fid03.smk b/mpq/portrait/protoss/empyrean/fid03.smk new file mode 100644 index 00000000..198eb286 Binary files /dev/null and b/mpq/portrait/protoss/empyrean/fid03.smk differ diff --git a/mpq/portrait/protoss/empyrean/tlk00.smk b/mpq/portrait/protoss/empyrean/tlk00.smk index fac9264e..7b3fed42 100644 Binary files a/mpq/portrait/protoss/empyrean/tlk00.smk and b/mpq/portrait/protoss/empyrean/tlk00.smk differ diff --git a/mpq/portrait/protoss/empyrean/tlk01.smk b/mpq/portrait/protoss/empyrean/tlk01.smk index 66b3c4f5..3ce6c91c 100644 Binary files a/mpq/portrait/protoss/empyrean/tlk01.smk and b/mpq/portrait/protoss/empyrean/tlk01.smk differ diff --git a/mpq/portrait/protoss/empyrean/tlk02.smk b/mpq/portrait/protoss/empyrean/tlk02.smk new file mode 100644 index 00000000..031d1ce0 Binary files /dev/null and b/mpq/portrait/protoss/empyrean/tlk02.smk differ diff --git a/mpq/portrait/protoss/idol/fid00.smk b/mpq/portrait/protoss/idol/fid00.smk index fc3f5638..3bdbac3b 100644 Binary files a/mpq/portrait/protoss/idol/fid00.smk and b/mpq/portrait/protoss/idol/fid00.smk differ diff --git a/mpq/portrait/protoss/idol/fid01.smk b/mpq/portrait/protoss/idol/fid01.smk index b356e2cc..2fb6098b 100644 Binary files a/mpq/portrait/protoss/idol/fid01.smk and b/mpq/portrait/protoss/idol/fid01.smk differ diff --git a/mpq/portrait/protoss/idol/fid02.smk b/mpq/portrait/protoss/idol/fid02.smk new file mode 100644 index 00000000..b45c5c17 Binary files /dev/null and b/mpq/portrait/protoss/idol/fid02.smk differ diff --git a/mpq/portrait/protoss/idol/tlk00.smk b/mpq/portrait/protoss/idol/tlk00.smk index fc3f5638..0d958e24 100644 Binary files a/mpq/portrait/protoss/idol/tlk00.smk and b/mpq/portrait/protoss/idol/tlk00.smk differ diff --git a/mpq/portrait/protoss/idol/tlk01.smk b/mpq/portrait/protoss/idol/tlk01.smk new file mode 100644 index 00000000..6a0c5767 Binary files /dev/null and b/mpq/portrait/protoss/idol/tlk01.smk differ diff --git a/mpq/portrait/special/barlow/fid00.smk b/mpq/portrait/special/barlow/fid00.smk index 19e6cd64..a7b677e8 100644 Binary files a/mpq/portrait/special/barlow/fid00.smk and b/mpq/portrait/special/barlow/fid00.smk differ diff --git a/mpq/portrait/special/barlow/fid01.smk b/mpq/portrait/special/barlow/fid01.smk index 3be397f5..92d6979a 100644 Binary files a/mpq/portrait/special/barlow/fid01.smk and b/mpq/portrait/special/barlow/fid01.smk differ diff --git a/mpq/portrait/special/barlow/fid02.smk b/mpq/portrait/special/barlow/fid02.smk index 28c56a25..4b7a47e0 100644 Binary files a/mpq/portrait/special/barlow/fid02.smk and b/mpq/portrait/special/barlow/fid02.smk differ diff --git a/mpq/portrait/special/barlow/tlk00.smk b/mpq/portrait/special/barlow/tlk00.smk index bbc78cb2..8bacea20 100644 Binary files a/mpq/portrait/special/barlow/tlk00.smk and b/mpq/portrait/special/barlow/tlk00.smk differ diff --git a/mpq/portrait/special/barlow/tlk01.smk b/mpq/portrait/special/barlow/tlk01.smk index 67efd736..9606d29c 100644 Binary files a/mpq/portrait/special/barlow/tlk01.smk and b/mpq/portrait/special/barlow/tlk01.smk differ diff --git a/mpq/portrait/special/joran/fid00.smk b/mpq/portrait/special/joran/fid00.smk index f09ceeb8..2bbd48aa 100644 Binary files a/mpq/portrait/special/joran/fid00.smk and b/mpq/portrait/special/joran/fid00.smk differ diff --git a/mpq/portrait/special/joran/fid01.smk b/mpq/portrait/special/joran/fid01.smk index fa6d4024..80fb3848 100644 Binary files a/mpq/portrait/special/joran/fid01.smk and b/mpq/portrait/special/joran/fid01.smk differ diff --git a/mpq/portrait/special/joran/fid02.smk b/mpq/portrait/special/joran/fid02.smk index 3bfaf94d..e80ff980 100644 Binary files a/mpq/portrait/special/joran/fid02.smk and b/mpq/portrait/special/joran/fid02.smk differ diff --git a/mpq/portrait/special/joran/fid03.smk b/mpq/portrait/special/joran/fid03.smk new file mode 100644 index 00000000..7c3bd22f Binary files /dev/null and b/mpq/portrait/special/joran/fid03.smk differ diff --git a/mpq/portrait/special/joran/tlk00.smk b/mpq/portrait/special/joran/tlk00.smk index 9dcc74dc..3f31c850 100644 Binary files a/mpq/portrait/special/joran/tlk00.smk and b/mpq/portrait/special/joran/tlk00.smk differ diff --git a/mpq/portrait/special/medly/fid00.smk b/mpq/portrait/special/medly/fid00.smk index 373e7858..0a92dacb 100644 Binary files a/mpq/portrait/special/medly/fid00.smk and b/mpq/portrait/special/medly/fid00.smk differ diff --git a/mpq/portrait/special/medly/tlk00.smk b/mpq/portrait/special/medly/tlk00.smk index 2d00c3e8..937a90ed 100644 Binary files a/mpq/portrait/special/medly/tlk00.smk and b/mpq/portrait/special/medly/tlk00.smk differ diff --git a/mpq/portrait/special/venammar/fid00.smk b/mpq/portrait/special/venammar/fid00.smk index a55da57a..e5a0541c 100644 Binary files a/mpq/portrait/special/venammar/fid00.smk and b/mpq/portrait/special/venammar/fid00.smk differ diff --git a/mpq/portrait/special/venammar/fid01.smk b/mpq/portrait/special/venammar/fid01.smk index 6879b90d..cd303c79 100644 Binary files a/mpq/portrait/special/venammar/fid01.smk and b/mpq/portrait/special/venammar/fid01.smk differ diff --git a/mpq/portrait/special/venammar/fid02.smk b/mpq/portrait/special/venammar/fid02.smk index 7ffd10d0..ba8a1d6a 100644 Binary files a/mpq/portrait/special/venammar/fid02.smk and b/mpq/portrait/special/venammar/fid02.smk differ diff --git a/mpq/portrait/special/venammar/fid03.smk b/mpq/portrait/special/venammar/fid03.smk index ff82664b..80fc4324 100644 Binary files a/mpq/portrait/special/venammar/fid03.smk and b/mpq/portrait/special/venammar/fid03.smk differ diff --git a/mpq/portrait/special/venammar/tlk00.smk b/mpq/portrait/special/venammar/tlk00.smk index 28013ba5..3c9f5c68 100644 Binary files a/mpq/portrait/special/venammar/tlk00.smk and b/mpq/portrait/special/venammar/tlk00.smk differ diff --git a/mpq/portrait/special/venammar/tlk01.smk b/mpq/portrait/special/venammar/tlk01.smk index f58260a3..278767d2 100644 Binary files a/mpq/portrait/special/venammar/tlk01.smk and b/mpq/portrait/special/venammar/tlk01.smk differ diff --git a/mpq/portrait/special/venammar/tlk02.smk b/mpq/portrait/special/venammar/tlk02.smk index b7f92db1..6319cbd7 100644 Binary files a/mpq/portrait/special/venammar/tlk02.smk and b/mpq/portrait/special/venammar/tlk02.smk differ diff --git a/mpq/portrait/terran/gorgon/fid00.smk b/mpq/portrait/terran/gorgon/fid00.smk index 2e1eaff7..bb51c3b9 100644 Binary files a/mpq/portrait/terran/gorgon/fid00.smk and b/mpq/portrait/terran/gorgon/fid00.smk differ diff --git a/mpq/portrait/terran/gorgon/fid01.smk b/mpq/portrait/terran/gorgon/fid01.smk index f6135026..1b2d12e0 100644 Binary files a/mpq/portrait/terran/gorgon/fid01.smk and b/mpq/portrait/terran/gorgon/fid01.smk differ diff --git a/mpq/portrait/terran/gorgon/fid02.smk b/mpq/portrait/terran/gorgon/fid02.smk index f0a1049f..dc39eb14 100644 Binary files a/mpq/portrait/terran/gorgon/fid02.smk and b/mpq/portrait/terran/gorgon/fid02.smk differ diff --git a/mpq/portrait/terran/gorgon/fid03.smk b/mpq/portrait/terran/gorgon/fid03.smk new file mode 100644 index 00000000..796dc8ef Binary files /dev/null and b/mpq/portrait/terran/gorgon/fid03.smk differ diff --git a/mpq/portrait/terran/gorgon/tlk00.smk b/mpq/portrait/terran/gorgon/tlk00.smk index 4db2e950..eba837bd 100644 Binary files a/mpq/portrait/terran/gorgon/tlk00.smk and b/mpq/portrait/terran/gorgon/tlk00.smk differ diff --git a/mpq/portrait/terran/gorgon/tlk01.smk b/mpq/portrait/terran/gorgon/tlk01.smk index 742b2a44..68708922 100644 Binary files a/mpq/portrait/terran/gorgon/tlk01.smk and b/mpq/portrait/terran/gorgon/tlk01.smk differ diff --git a/mpq/portrait/terran/gorgon/tlk02.smk b/mpq/portrait/terran/gorgon/tlk02.smk new file mode 100644 index 00000000..2c99435e Binary files /dev/null and b/mpq/portrait/terran/gorgon/tlk02.smk differ diff --git a/mpq/portrait/terran/silvertongue/fid00.smk b/mpq/portrait/terran/silvertongue/fid00.smk index ec87224a..29bcc77c 100644 Binary files a/mpq/portrait/terran/silvertongue/fid00.smk and b/mpq/portrait/terran/silvertongue/fid00.smk differ diff --git a/mpq/portrait/terran/silvertongue/fid01.smk b/mpq/portrait/terran/silvertongue/fid01.smk index a3f1c249..daf87f83 100644 Binary files a/mpq/portrait/terran/silvertongue/fid01.smk and b/mpq/portrait/terran/silvertongue/fid01.smk differ diff --git a/mpq/portrait/terran/silvertongue/fid02.smk b/mpq/portrait/terran/silvertongue/fid02.smk index cfc431fe..d98c081a 100644 Binary files a/mpq/portrait/terran/silvertongue/fid02.smk and b/mpq/portrait/terran/silvertongue/fid02.smk differ diff --git a/mpq/portrait/terran/silvertongue/fid03.smk b/mpq/portrait/terran/silvertongue/fid03.smk index 0195eaff..b786c068 100644 Binary files a/mpq/portrait/terran/silvertongue/fid03.smk and b/mpq/portrait/terran/silvertongue/fid03.smk differ diff --git a/mpq/portrait/terran/silvertongue/tlk00.smk b/mpq/portrait/terran/silvertongue/tlk00.smk index 0ed6f419..8bb4e069 100644 Binary files a/mpq/portrait/terran/silvertongue/tlk00.smk and b/mpq/portrait/terran/silvertongue/tlk00.smk differ diff --git a/mpq/portrait/terran/silvertongue/tlk01.smk b/mpq/portrait/terran/silvertongue/tlk01.smk index 5f449a77..c48aad4d 100644 Binary files a/mpq/portrait/terran/silvertongue/tlk01.smk and b/mpq/portrait/terran/silvertongue/tlk01.smk differ diff --git a/mpq/portrait/terran/silvertongue/tlk02.smk b/mpq/portrait/terran/silvertongue/tlk02.smk index 647bc283..4e55fa36 100644 Binary files a/mpq/portrait/terran/silvertongue/tlk02.smk and b/mpq/portrait/terran/silvertongue/tlk02.smk differ diff --git a/mpq/portrait/zerg/akistrokor/fid00.smk b/mpq/portrait/zerg/akistrokor/fid00.smk index 72ecb6c1..81b69d40 100644 Binary files a/mpq/portrait/zerg/akistrokor/fid00.smk and b/mpq/portrait/zerg/akistrokor/fid00.smk differ diff --git a/mpq/portrait/zerg/akistrokor/fid01.smk b/mpq/portrait/zerg/akistrokor/fid01.smk index 805ba12e..f980e862 100644 Binary files a/mpq/portrait/zerg/akistrokor/fid01.smk and b/mpq/portrait/zerg/akistrokor/fid01.smk differ diff --git a/mpq/portrait/zerg/akistrokor/fid02.smk b/mpq/portrait/zerg/akistrokor/fid02.smk index fc07587d..974873f6 100644 Binary files a/mpq/portrait/zerg/akistrokor/fid02.smk and b/mpq/portrait/zerg/akistrokor/fid02.smk differ diff --git a/mpq/portrait/zerg/akistrokor/fid03.smk b/mpq/portrait/zerg/akistrokor/fid03.smk index 2e5e54fd..b02f2767 100644 Binary files a/mpq/portrait/zerg/akistrokor/fid03.smk and b/mpq/portrait/zerg/akistrokor/fid03.smk differ diff --git a/mpq/portrait/zerg/akistrokor/tlk00.smk b/mpq/portrait/zerg/akistrokor/tlk00.smk index 7f95b190..49ae864c 100644 Binary files a/mpq/portrait/zerg/akistrokor/tlk00.smk and b/mpq/portrait/zerg/akistrokor/tlk00.smk differ diff --git a/mpq/portrait/zerg/akistrokor/tlk01.smk b/mpq/portrait/zerg/akistrokor/tlk01.smk index c9054d58..976a389b 100644 Binary files a/mpq/portrait/zerg/akistrokor/tlk01.smk and b/mpq/portrait/zerg/akistrokor/tlk01.smk differ diff --git a/mpq/portrait/zerg/konvilisk/fid00.smk b/mpq/portrait/zerg/konvilisk/fid00.smk index 8b06a15c..33f2a96d 100644 Binary files a/mpq/portrait/zerg/konvilisk/fid00.smk and b/mpq/portrait/zerg/konvilisk/fid00.smk differ diff --git a/mpq/portrait/zerg/konvilisk/fid01.smk b/mpq/portrait/zerg/konvilisk/fid01.smk index 8fd4918c..4bfafe1a 100644 Binary files a/mpq/portrait/zerg/konvilisk/fid01.smk and b/mpq/portrait/zerg/konvilisk/fid01.smk differ diff --git a/mpq/portrait/zerg/konvilisk/fid02.smk b/mpq/portrait/zerg/konvilisk/fid02.smk index db33fc0b..5d525a46 100644 Binary files a/mpq/portrait/zerg/konvilisk/fid02.smk and b/mpq/portrait/zerg/konvilisk/fid02.smk differ diff --git a/mpq/portrait/zerg/konvilisk/tlk00.smk b/mpq/portrait/zerg/konvilisk/tlk00.smk index b7d96368..b4735ed4 100644 Binary files a/mpq/portrait/zerg/konvilisk/tlk00.smk and b/mpq/portrait/zerg/konvilisk/tlk00.smk differ diff --git a/mpq/portrait/zerg/tethzorokor/fid00.smk b/mpq/portrait/zerg/tethzorokor/fid00.smk index fac94cf9..245dce8e 100644 Binary files a/mpq/portrait/zerg/tethzorokor/fid00.smk and b/mpq/portrait/zerg/tethzorokor/fid00.smk differ diff --git a/mpq/portrait/zerg/tethzorokor/fid01.smk b/mpq/portrait/zerg/tethzorokor/fid01.smk index 251c4aa7..c6650534 100644 Binary files a/mpq/portrait/zerg/tethzorokor/fid01.smk and b/mpq/portrait/zerg/tethzorokor/fid01.smk differ diff --git a/mpq/portrait/zerg/tethzorokor/fid02.smk b/mpq/portrait/zerg/tethzorokor/fid02.smk index a6f8fc43..a318b575 100644 Binary files a/mpq/portrait/zerg/tethzorokor/fid02.smk and b/mpq/portrait/zerg/tethzorokor/fid02.smk differ diff --git a/mpq/portrait/zerg/tethzorokor/tlk00.smk b/mpq/portrait/zerg/tethzorokor/tlk00.smk index 2ac9f4ca..bf4e717c 100644 Binary files a/mpq/portrait/zerg/tethzorokor/tlk00.smk and b/mpq/portrait/zerg/tethzorokor/tlk00.smk differ diff --git a/mpq/portrait/zerg/tethzorokor/tlk01.smk b/mpq/portrait/zerg/tethzorokor/tlk01.smk index 5157fd3a..d13366fa 100644 Binary files a/mpq/portrait/zerg/tethzorokor/tlk01.smk and b/mpq/portrait/zerg/tethzorokor/tlk01.smk differ diff --git a/mpq/portrait/zerg/tosgrilisk/fid00.smk b/mpq/portrait/zerg/tosgrilisk/fid00.smk index 6050e5ad..f8b61f16 100644 Binary files a/mpq/portrait/zerg/tosgrilisk/fid00.smk and b/mpq/portrait/zerg/tosgrilisk/fid00.smk differ diff --git a/mpq/portrait/zerg/tosgrilisk/fid01.smk b/mpq/portrait/zerg/tosgrilisk/fid01.smk index c64739e7..2118d7d2 100644 Binary files a/mpq/portrait/zerg/tosgrilisk/fid01.smk and b/mpq/portrait/zerg/tosgrilisk/fid01.smk differ diff --git a/mpq/portrait/zerg/tosgrilisk/fid02.smk b/mpq/portrait/zerg/tosgrilisk/fid02.smk index 695b572a..52701c64 100644 Binary files a/mpq/portrait/zerg/tosgrilisk/fid02.smk and b/mpq/portrait/zerg/tosgrilisk/fid02.smk differ diff --git a/mpq/portrait/zerg/tosgrilisk/tlk00.smk b/mpq/portrait/zerg/tosgrilisk/tlk00.smk index 236ff614..ad664aef 100644 Binary files a/mpq/portrait/zerg/tosgrilisk/tlk00.smk and b/mpq/portrait/zerg/tosgrilisk/tlk00.smk differ diff --git a/mpq/portrait/zerg/tosgrilisk/tlk01.smk b/mpq/portrait/zerg/tosgrilisk/tlk01.smk index 6831833f..617ac7f5 100644 Binary files a/mpq/portrait/zerg/tosgrilisk/tlk01.smk and b/mpq/portrait/zerg/tosgrilisk/tlk01.smk differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index f075da37..e3241ef4 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index fa4e1b6e..e9b319a6 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 833dfd82..b747b3f4 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -40,6 +40,7 @@ unit_morph_prerequisites = Add(droleth, gosvileth, 1) unit_morph_prerequisites = Add(ovileth, iroleth, 1) unit_morph_prerequisites = Add(othstoleth, alaszileth, 1) unit_morph_prerequisites = Add(zethrokor, vorvrokor, 1) +unit_morph_prerequisites = Add(zethrokor, gorvrokor, 1) unit_morph_prerequisites = Add(quazilisk, liiralisk, 1) unit_morph_prerequisites = Add(quazrokor, liiralisk, 1) unit_morph_prerequisites = Add(nathrokor, kalkalisk, 1) @@ -48,6 +49,7 @@ unit_morph_prerequisites = Add(cikralisk, ghitorokor, 1) unit_morph_prerequisites = Add(protathalor, sovroleth, 1) unit_morph_prerequisites = Add(mutalisk, tosgrilisk, 1) unit_morph_prerequisites = Add(hydralisk, bactalisk, 1) +unit_morph_prerequisites = Add(hydralisk_orkoti, bactalisk, 1) unit_morph_prerequisites = Add(izirokor, tethzorokor, 1) unit_morph_prerequisites = Add(iziralisk, tethzorokor, 1) unit_morph_prerequisites = Add(skithrokor, vithrilisk, 1) @@ -88,6 +90,7 @@ morph_train_ai = Add(droleth, gosvileth) morph_train_ai = Add(ovileth, iroleth) morph_train_ai = Add(othstoleth, alaszileth) morph_train_ai = Add(zethrokor, vorvrokor) +morph_train_ai = Add(zethrokor, gorvrokor) morph_train_ai = Add(quazilisk, liiralisk) morph_train_ai = Add(quazrokor, liiralisk) morph_train_ai = Add(nathrokor, kalkalisk) @@ -97,6 +100,7 @@ morph_train_ai = Add(protathalor, sovroleth) morph_train_ai = Add(mutalisk, tosgrilisk) morph_train_ai = Remove(mutalisk, vithrilisk) morph_train_ai = Add(hydralisk, bactalisk) +morph_train_ai = Add(hydralisk_orkoti, bactalisk) morph_train_ai = Add(izirokor, tethzorokor) morph_train_ai = Add(iziralisk, tethzorokor) morph_train_ai = Add(skithrokor, vithrilisk) diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 8be5b5fb..99349e45 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -48,7 +48,11 @@ military qilin = 398 military auriel = 399 military cyclops_futurist = 410 military harakan_golden = 413 +military cleric_futurist = 418 military blackjack_golden = 431 +military eidolon_nydus = 432 +military tiangou = 433 +military maverick_futurist = 435 # Protoss factional units military adherent = 400 @@ -59,6 +63,7 @@ military cicatus = 414 military renesair = 423 military ashguard = 424 military dracadin_order = 430 +military manifold_starbound = 437 # Zerg factional units military nathrelisk = 402 @@ -66,6 +71,7 @@ military iziralisk = 403 military inzorthrokor = 415 military quazrokor = 422 military lakizilisk_zorthos = 425 +military hydralisk_orkoti = 436 # Terran military units military maverick = 0 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 01e34494..8b6f6949 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index dfce9c21..78e51c39 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -7577,38 +7577,6 @@ MinistryIsWorking: wait 3 playfram 0x00 wait 1 - playfram 6 - wait 4 - playfram 0x00 - wait 1 - playfram 6 - wait 1 - playfram 0x00 - wait 1 - playfram 6 - wait 3 - playfram 0x00 - wait 1 - playfram 6 - wait 3 - playfram 0x00 - wait 1 - playfram 6 - wait 4 - playfram 0x00 - wait 1 - playfram 6 - wait 3 - playfram 0x00 - wait 1 - playfram 6 - wait 1 - playfram 0x00 - wait 1 - playfram 6 - wait 1 - playfram 0x00 - wait 1 goto MinistryIsWorking MinistryWorkingToIdle: @@ -9095,11 +9063,11 @@ DaedalaOverlayIsWorking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 312 Missile Silo (terran\nukesilo.grp) +# 312 Anvil (terran\nukesilo.grp) .headerstart IsId 128 Type 24 -Init MissileSiloInit +Init AnvilInit Death AtelierDeath GndAttkInit [NONE] AirAttkInit [NONE] @@ -9114,55 +9082,55 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt MissileSiloAlmostBuilt -Built MissileSiloBuilt -Landing MissileSiloLanding +AlmostBuilt AnvilAlmostBuilt +Built AnvilBuilt +Landing AnvilLanding LiftOff ScourgeLocal00 -IsWorking MissileSiloIsWorking -WorkingToIdle MissileSiloBuilt +IsWorking AnvilIsWorking +WorkingToIdle AnvilBuilt WarpIn [NONE] -Unused3 MissileSiloUnused3 +Unused3 AnvilUnused3 StarEditInit [NONE] -Disable MissileSiloDisable +Disable AnvilDisable Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -MissileSiloInit: +AnvilInit: imgul 315 0 0 # Nuclear Silo Shadow (terran\tnsShad.grp) -MissileSiloBuilt: +AnvilBuilt: playfram 0x00 goto ScourgeLocal00 -MissileSiloAlmostBuilt: +AnvilAlmostBuilt: playfram 1 goto ScourgeLocal00 -MissileSiloLanding: +AnvilLanding: imgol 313 0 0 # Nuclear Silo Connector (terran\NukeSilC.grp) goto ScourgeLocal00 -MissileSiloIsWorking: +AnvilIsWorking: playfram 2 wait 4 playfram 0x00 wait 4 - goto MissileSiloIsWorking + goto AnvilIsWorking -MissileSiloUnused3: +AnvilUnused3: playfram 2 goto ScourgeLocal00 -MissileSiloDisable: +AnvilDisable: goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 313 Nuclear Silo Connector (terran\NukeSilC.grp) +# 313 Anvil Connector (terran\NukeSilC.grp) .headerstart IsId 129 Type 24 -Init MissileSiloConnectorInit +Init AnvilConnectorInit Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] @@ -9180,8 +9148,8 @@ SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] Landing Generic_Wait1End -LiftOff MissileSiloConnectorLiftOff -IsWorking MissileSiloConnectorIsWorking +LiftOff AnvilConnectorLiftOff +IsWorking AnvilConnectorIsWorking WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] @@ -9191,7 +9159,7 @@ Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -MissileSiloConnectorInit: +AnvilConnectorInit: playfram 0x00 wait 2 playfram 1 @@ -9200,11 +9168,11 @@ MissileSiloConnectorInit: wait 2 playfram 3 wait 2 -MissileSiloConnectorIsWorking: +AnvilConnectorIsWorking: playfram 4 goto ScourgeLocal00 -MissileSiloConnectorLiftOff: +AnvilConnectorLiftOff: playfram 3 wait 2 playfram 2 @@ -9218,11 +9186,11 @@ MissileSiloConnectorLiftOff: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 314 Nuclear Silo Overlay (terran\NukeSilT.grp) +# 314 Anvil Overlay (terran\NukeSilT.grp) .headerstart IsId 130 Type 24 -Init MissileSiloOverlayInit +Init AnvilOverlayInit Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] @@ -9241,7 +9209,7 @@ AlmostBuilt [NONE] Built [NONE] Landing Generic_Wait1End LiftOff Generic_Wait1End -IsWorking MissileSiloOverlayIsWorking +IsWorking AnvilOverlayIsWorking WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] @@ -9251,23 +9219,23 @@ Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -MissileSiloOverlayInit: +AnvilOverlayInit: playfram 0x00 -MissileSiloOverlayIsWorking: +AnvilOverlayIsWorking: tmprmgraphicend wait 5 tmprmgraphicstart wait 5 - goto MissileSiloOverlayIsWorking + goto AnvilOverlayIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 316 Nuclear Missile (terran\nukemiss.grp) +# 316 Morningstar (terran\nukemiss.grp) .headerstart IsId 131 Type 21 -Init NuclearMissileInit -Death NuclearMissileDeath +Init MorningstarInit +Death MorningstarDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9277,9 +9245,9 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking NuclearMissileWalking +Walking MorningstarWalking WalkingToIdle ScourgeLocal00 -SpecialState1 NuclearMissileSpecialState1 +SpecialState1 MorningstarSpecialState1 SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] @@ -9287,32 +9255,32 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn NuclearMissileWarpIn +WarpIn MorningstarWarpIn .headerend # ----------------------------------------------------------------------------- # -NuclearMissileInit: +MorningstarInit: playfram 0x00 goto ScourgeLocal00 -NuclearMissileDeath: +MorningstarDeath: imgol 428 0 0 # Nuclear Missile Death (thingy\small.grp) wait 1 end -NuclearMissileWalking: - curdirectcondjmp 128 32 NuclearMissileLocal00 -NuclearMissileLocal01: +MorningstarWalking: + curdirectcondjmp 128 32 MorningstarLocal00 +MorningstarLocal01: sprol 309 0 10 # Longbolt/Gemini Missiles Trail (thingy\smoke.grp) wait 3 - goto NuclearMissileLocal01 + goto MorningstarLocal01 -NuclearMissileLocal00: +MorningstarLocal00: wait 3 sprol 309 0 -10 # Longbolt/Gemini Missiles Trail (thingy\smoke.grp) - goto NuclearMissileLocal00 + goto MorningstarLocal00 -NuclearMissileSpecialState1: +MorningstarSpecialState1: castspell sigorder 1 tmprmgraphicstart @@ -9320,14 +9288,14 @@ NuclearMissileSpecialState1: sprol 267 0 -42 # Nuke Hit (thingy\NukeHit.grp) goto ScourgeLocal00 -NuclearMissileWarpIn: +MorningstarWarpIn: wait 250 sigorder 2 goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 318 Nuke Hit (thingy\NukeHit.grp) +# 318 Morningstar Hit (thingy\NukeHit.grp) .headerstart IsId 133 Type 1 @@ -11496,21 +11464,6 @@ TemplarArchivesDeath: end TemplarArchivesIsWorking: - playfram 2 - wait 2 - playfram 1 - wait 1 - playfram 2 - wait 1 - playfram 1 - wait 1 - playfram 2 - wait 2 - playfram 1 - wait 2 - playfram 2 - wait 1 - playfram 1 wait 1 goto TemplarArchivesIsWorking @@ -16154,12 +16107,12 @@ DoubleExplosionInit: .headerstart IsId 279 Type 1 -Init NuclearMissileDeathInit -Death NuclearMissileDeathDeath +Init MorningstarDeathInit +Death MorningstarDeathDeath .headerend # ----------------------------------------------------------------------------- # -NuclearMissileDeathInit: +MorningstarDeathInit: playsnd 9 # Misc\ExploSm.wav playfram 0x00 wait 2 @@ -16181,7 +16134,7 @@ NuclearMissileDeathInit: wait 2 playfram 9 wait 1 -NuclearMissileDeathDeath: +MorningstarDeathDeath: wait 1 end @@ -29615,7 +29568,6 @@ ManifoldGndAttkInit: wait 1 nobrkcodestart playfram 0x20 - playsndbtwn 1310 1312 # Manifold weaponfire 01, 02, 03 attackwith 1 wait 1 playfram 0x00 @@ -32398,7 +32350,7 @@ Type 26 Init ZoryusthalethInit Death ZoryusthalethDeath GndAttkInit ZoryusthalethGndAttkInit -AirAttkInit [NONE] +AirAttkInit ZoryusthalethGndAttkInit Unused1 ZoryusthalethUnused1 GndAttkRpt ZoryusthalethGndAttkInit AirAttkRpt ZoryusthalethGndAttkInit @@ -35471,62 +35423,12 @@ ClaymoreGndAttkInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1361 Claymore Turret (cm\terran\claymore-turret.grp) -.headerstart -IsId 580 -Type 12 -Init ClaymoreTurretInit -Death Generic_Wait1End -GndAttkInit ClaymoreTurretGndAttkInit -AirAttkInit ClaymoreTurretGndAttkInit -Unused1 [NONE] -GndAttkRpt ClaymoreTurretGndAttkInit -AirAttkRpt ClaymoreTurretGndAttkInit -CastSpell [NONE] -GndAttkToIdle ClaymoreTurretInit -AirAttkToIdle ClaymoreTurretInit -Unused2 [NONE] -Walking ClaymoreTurretWalking -WalkingToIdle ClaymoreTurretInit -SpecialState1 [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -ClaymoreTurretInit: - playfram 0x00 - wait 1 - goto ScourgeLocal00 - -ClaymoreTurretGndAttkInit: - playfram 0x33 - wait 1 - playfram 0x00 - wait 1 - playfram 0x33 - wait 1 - playfram 0x00 - goto ClaymoreTurretInit - -ClaymoreTurretWalking: - move 0 - wait 1 - playfram 0x11 - move 0 - wait 1 - playfram 0x22 - move 0 - wait 1 - playfram 0x00 - goto ClaymoreTurretWalking - -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1363 Bactith Swamp (cm\zerg\bactith-swamp.grp) +# 1363 Tethvith Swamp (cm\zerg\tethvith-swamp.grp) .headerstart IsId 581 Type 20 -Init BactithSwampInit -Death BactithSwampDeath +Init TethvithSwampInit +Death TethvithSwampDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -35540,22 +35442,22 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt BactithSwampAlmostBuilt -Built BactithSwampBuilt +AlmostBuilt TethvithSwampAlmostBuilt +Built TethvithSwampBuilt Landing [NONE] LiftOff [NONE] -IsWorking BactithSwampIsWorking -WorkingToIdle BactithSwampWorkingToIdle +IsWorking TethvithSwampIsWorking +WorkingToIdle TethvithSwampWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -BactithSwampInit: +TethvithSwampInit: imgul 1364 0 0 # Bactith Swamp Shadow (cm\zerg\bactith-swamp-shad.grp) playfram 0x00 - goto BactithSwampWorkingToIdle + goto TethvithSwampWorkingToIdle -BactithSwampWorkingToIdle: +TethvithSwampWorkingToIdle: playfram 1 wait 2 playfram 2 @@ -35568,9 +35470,9 @@ BactithSwampWorkingToIdle: wait 2 playfram 0x00 wait 4 - goto BactithSwampWorkingToIdle + goto TethvithSwampWorkingToIdle -BactithSwampDeath: +TethvithSwampDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) wait 3 @@ -35578,16 +35480,16 @@ BactithSwampDeath: wait 1 end -BactithSwampAlmostBuilt: +TethvithSwampAlmostBuilt: imgol 107 0 0 # Zerg Building Spawn (Small) (zerg\zSpawn01.grp) -BactithSwampBuilt: +TethvithSwampBuilt: playfram 0x00 wait 1 - randcondjmp 128 BactithSwampWorkingToIdle + randcondjmp 128 TethvithSwampWorkingToIdle wait 1 - goto BactithSwampWorkingToIdle + goto TethvithSwampWorkingToIdle -BactithSwampIsWorking: +TethvithSwampIsWorking: playfram 1 wait 1 playfram 2 @@ -35598,7 +35500,7 @@ BactithSwampIsWorking: wait 1 playfram 0x00 wait 2 - goto BactithSwampIsWorking + goto TethvithSwampIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -36311,57 +36213,6 @@ BurstLasersBlueSilentEpigraphDeath: wait 1 end -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1391 Vorvrokor Birth -.headerstart -IsId 595 -Type 13 -Init VorvrokorBirthInit -Death Generic_Wait1End -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 VorvrokorBirthSpecialState1 -.headerend -# ----------------------------------------------------------------------------- # - -VorvrokorBirthInit: - playfram 0x00 - goto ScourgeLocal00 - -VorvrokorBirthSpecialState1: - wait 1 - nobrkcodestart - playfram 0x00 - wait 2 - playfram 1 - wait 2 - playfram 2 - wait 2 - playfram 3 - wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - sigorder 4 - lowsprul 319 0 0 # Egg Spawn (zerg\zegspawn.grp) - nobrkcodeend - goto ScourgeLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1392 Skithrokor (cm\zerg\skithrokor.grp) @@ -36375,7 +36226,7 @@ AirAttkInit SkithrokorGndAttkInit Unused1 SkithrokorUnused1 GndAttkRpt SkithrokorGndAttkInit AirAttkRpt SkithrokorGndAttkInit -CastSpell SkithrokorCastSpell +CastSpell [NONE] GndAttkToIdle SkithrokorWalkingToIdle AirAttkToIdle SkithrokorWalkingToIdle Unused2 [NONE] @@ -36446,29 +36297,6 @@ SkithrokorGndAttkInit: playfram 0x00 wait 1 goto SkithrokorWalkingToIdle - -SkithrokorCastSpell: - nobrkcodestart - playfram 0x100 - wait 1 - playfram 0x120 - wait 1 - playfram 0x140 - wait 1 - playfram 0x160 - wait 1 - playfram 0x180 - wait 1 - playfram 0x1A0 - castspell - wait 1 - playfram 0x1C0 - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk - goto SkithrokorWalkingToIdle SkithrokorWalking: playfram 0x20 @@ -36560,19 +36388,20 @@ LiiraliskUnused1: setfldirect 0 playsnd 1171 playfram 0x99 - wait 2 +# wait 2 # playfram 0xaa - wait 2 +# wait 2 # playfram 0xbb - wait 2 +# wait 2 # playfram 0xcc - wait 2 +# wait 2 # playfram 0xdd - wait 2 +# wait 2 # playfram 0xee - wait 2 +# wait 2 # playfram 0xff - wait 2 +# wait 2 + wait 14 setfldirect 10 nobrkcodeend goto LiiraliskGndAttkToIdle @@ -36727,7 +36556,7 @@ SovrolethCastSpell: castspell gotorepeatattk sigorder 2 - goto SovrolethLocal01 + goto SovrolethLocal01 SovrolethLocal01: playfram 0x11 @@ -36934,19 +36763,20 @@ OlympianRevive: playsndbtwn 1161 1162 sprol 742 0 0 # playfram 176 - wait 2 +# wait 2 # playfram 175 - wait 2 +# wait 2 # playfram 174 - wait 2 +# wait 2 # playfram 173 - wait 2 +# wait 2 # playfram 172 - wait 2 +# wait 2 # playfram 171 - wait 2 +# wait 2 # playfram 170 - wait 2 +# wait 2 + wait 14 setfldirect 12 nobrkcodeend goto OlympianWalkingToIdle @@ -52386,7 +52216,7 @@ XenolithWarpIn: .headerstart IsId 812 Type 21 -Init LandlockInit +Init MinistryInit Death InfestedMinistryDeath GndAttkInit [NONE] AirAttkInit [NONE] @@ -52405,17 +52235,17 @@ AlmostBuilt [NONE] Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] -IsWorking LandlockIsWorking -WorkingToIdle LandlockWorkingToIdle +IsWorking MinistryIsWorking +WorkingToIdle MinistryWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -LandlockInit: - imgul 1998 0 0 # Landlock Shadow (cm\askosi\landlock-shadow.grp) -LandlockWorkingToIdle: - playfram 0x00 - goto ScourgeLocal00 +#LandlockInit: +# imgul 1998 0 0 # Landlock Shadow (cm\askosi\landlock-shadow.grp) +#LandlockWorkingToIdle: +# playfram 0x00 +# goto ScourgeLocal00 #LandlockDeath: # playsnd 7 # Misc\ExploLrg.wav @@ -52430,7 +52260,7 @@ LandlockWorkingToIdle: # imgol 1820 0 0 # Architect weaponfire channel # goto ScourgeLocal00 -LandlockIsWorking: +#LandlockIsWorking: # playfram 1 # wait 1 # playfram 2 @@ -52444,8 +52274,8 @@ LandlockIsWorking: # playfram 6 # wait 1 # playfram 7 - wait 1 - goto LandlockIsWorking +# wait 1 +# goto LandlockIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52523,4 +52353,261 @@ QuazrokorInit: imgul 2000 0 0 # Quazrokor Shadow (cm\faction-z\quazrokor-shadow.grp) goto QuaziliskGndAttkToIdle -## Next free IsId: 816 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2017 Tencendur (cm\terran\tencendur.grp) +.headerstart +IsId 816 +Type 24 +Init TencendurInit +Death AtelierDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt AnchorAlmostBuilt +Built TencendurBuilt +Landing AnchorLanding +LiftOff AnchorLiftOff +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable ScourgeLocal00 +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +TencendurInit: + imgul 2018 0 0 # Tencendur Shadow (cm\terran\tencendur-shadow.grp) + goto ScourgeLocal00 + +TencendurBuilt: + imgol 2023 0 -48 # Tencendur Flag (cm\terran\tencendur-flag.grp) + goto AnchorBuilt + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2008 Tiangou Base (cm\faction-t\tiangou-base.grp) +.headerstart +IsId 817 +Type 12 +Init Tiangou_Base_Init +Death Goliath_Base_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 Goliath_Base_Unused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Goliath_Base_Walking +WalkingToIdle Goliath_Base_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Tiangou_Base_Init: + imgul 2010 0 0 # Tiangou Shadow (cm\faction-t\tiangou-shadow.grp) + goto Goliath_Base_WalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2009 Tiangou Turret (cm\faction-t\tiangou-turret.grp) +.headerstart +IsId 818 +Type 12 +Init Goliath_Turret_Init +Death Generic_Wait1End +GndAttkInit Tiangou_Turret_GndAttkInit +AirAttkInit Tiangou_Turret_GndAttkInit +Unused1 [NONE] +GndAttkRpt Tiangou_Turret_GndAttkRpt +AirAttkRpt Tiangou_Turret_GndAttkRpt +CastSpell [NONE] +GndAttkToIdle Goliath_Turret_Init +AirAttkToIdle Goliath_Turret_Init +Unused2 [NONE] +Walking Goliath_Turret_Walking +WalkingToIdle Goliath_Turret_Init +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Tiangou_Turret_GndAttkInit: + wait 1 +Tiangou_Turret_GndAttkRpt: + wait 1 + nobrkcodestart + playfram 0xdd + attackwith 1 + wait 1 + playfram 0x121 + wait 1 + playfram 0xee + attackwith 1 + wait 1 + playfram 0x121 + wait 7 + playfram 0xff + attackwith 1 + wait 1 + playfram 0x121 + wait 1 + playfram 0x110 + attackwith 1 + wait 1 + playfram 0x121 + wait 3 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto Goliath_Turret_Init + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2023 Tencendur Flag (cm\terran\tencendur-flag.grp) +.headerstart +IsId 819 +Type 24 +Init TencedurFlagGround +Death Generic_Wait1End +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking TencedurFlagAir +WalkingToIdle TencedurFlagGround +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt TencedurFlagGround +Built TencedurFlagGround +Landing TencedurFlagAir +LiftOff TencedurFlagAir +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable TencedurFlagGround +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +TencedurFlagGround: + playfram 0x00 + wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 +TencedurFlagLocal01: + playfram 0x33 + wait 2 + playfram 0x44 + wait 2 + playfram 0x55 + wait 2 + playfram 0x66 + wait 2 + playfram 0x77 + wait 2 + playfram 0x88 + wait 2 + goto TencedurFlagLocal01 + +TencedurFlagAir: + playfram 0x99 + wait 2 + playfram 0xAA + wait 2 + playfram 0xBB + wait 2 + playfram 0xCC + wait 2 + playfram 0xDD + wait 2 + playfram 0xEE + wait 2 + goto TencedurFlagAir + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2024 Inzorthrokor (cm\faction-t\inzorthrokor.grp) +.headerstart +IsId 820 +Type 26 +Init ZoryusthalethInit +Death ZoryusthalethDeath +GndAttkInit InzorthrokorGndAttkInit +AirAttkInit InzorthrokorGndAttkInit +Unused1 ZoryusthalethUnused1 +GndAttkRpt InzorthrokorGndAttkInit +AirAttkRpt InzorthrokorGndAttkInit +CastSpell ZoryusthalethCastSpell +GndAttkToIdle ZoryusthalethGndAttkToIdle +AirAttkToIdle ZoryusthalethGndAttkToIdle +Unused2 [NONE] +Walking ZoryusthalethWalking +WalkingToIdle ZoryusthalethGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 ZoryusthalethSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow ZoryusthalethBurrow +UnBurrow ZoryusthalethUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +InzorthrokorGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playsndbtwn 1918 1919 # Zoryusthaleth weaponfire 01, 02 + playfram 0xaa + wait 1 + playfram 0xbb + wait 1 + playfram 0xcc + wait 1 + playfram 0xdd + attack + wait 1 + playfram 0xcc + wait 1 + playfram 0xbb + wait 1 + playfram 0xaa + nobrkcodeend + gotorepeatattk + goto ZoryusthalethGndAttkToIdle + +## Next free IsId: 821 \ No newline at end of file diff --git a/mpq/sound/cm/f-t/eidolon-nydus/wf-01.wav b/mpq/sound/cm/f-t/eidolon-nydus/wf-01.wav new file mode 100644 index 00000000..e33fcb78 Binary files /dev/null and b/mpq/sound/cm/f-t/eidolon-nydus/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/eidolon-nydus/wf-02.wav b/mpq/sound/cm/f-t/eidolon-nydus/wf-02.wav new file mode 100644 index 00000000..1ec188d7 Binary files /dev/null and b/mpq/sound/cm/f-t/eidolon-nydus/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/eidolon-nydus/wf-03.wav b/mpq/sound/cm/f-t/eidolon-nydus/wf-03.wav new file mode 100644 index 00000000..6f4b9092 Binary files /dev/null and b/mpq/sound/cm/f-t/eidolon-nydus/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/eidolon-nydus/wf-04.wav b/mpq/sound/cm/f-t/eidolon-nydus/wf-04.wav new file mode 100644 index 00000000..25fe354b Binary files /dev/null and b/mpq/sound/cm/f-t/eidolon-nydus/wf-04.wav differ diff --git a/mpq/sound/cm/f-t/eidolon-nydus/wf-05.wav b/mpq/sound/cm/f-t/eidolon-nydus/wf-05.wav new file mode 100644 index 00000000..fb83b3e6 Binary files /dev/null and b/mpq/sound/cm/f-t/eidolon-nydus/wf-05.wav differ diff --git a/mpq/sound/cm/f-t/maverick-futurist/wf-01.wav b/mpq/sound/cm/f-t/maverick-futurist/wf-01.wav new file mode 100644 index 00000000..1ab633fb Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-futurist/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/maverick-futurist/wf-02.wav b/mpq/sound/cm/f-t/maverick-futurist/wf-02.wav new file mode 100644 index 00000000..1100b5dd Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-futurist/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/maverick-futurist/wf-03.wav b/mpq/sound/cm/f-t/maverick-futurist/wf-03.wav new file mode 100644 index 00000000..27fe394a Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-futurist/wf-03.wav differ diff --git a/mpq/unit/cm/faction-p/manifold-starbound-shadow.grp b/mpq/unit/cm/faction-p/manifold-starbound-shadow.grp new file mode 100644 index 00000000..2d4796d1 Binary files /dev/null and b/mpq/unit/cm/faction-p/manifold-starbound-shadow.grp differ diff --git a/mpq/unit/cm/faction-p/manifold-starbound.grp b/mpq/unit/cm/faction-p/manifold-starbound.grp new file mode 100644 index 00000000..ce1819b3 Binary files /dev/null and b/mpq/unit/cm/faction-p/manifold-starbound.grp differ diff --git a/mpq/unit/cm/faction-t/maverick-futurist.grp b/mpq/unit/cm/faction-t/maverick-futurist.grp new file mode 100644 index 00000000..df5aa947 Binary files /dev/null and b/mpq/unit/cm/faction-t/maverick-futurist.grp differ diff --git a/mpq/unit/cm/faction-t/tiangou-attack.lol b/mpq/unit/cm/faction-t/tiangou-attack.lol new file mode 100644 index 00000000..4e3652a7 Binary files /dev/null and b/mpq/unit/cm/faction-t/tiangou-attack.lol differ diff --git a/mpq/unit/cm/faction-t/tiangou-base.grp b/mpq/unit/cm/faction-t/tiangou-base.grp index 799da83f..c84fa15f 100644 Binary files a/mpq/unit/cm/faction-t/tiangou-base.grp and b/mpq/unit/cm/faction-t/tiangou-base.grp differ diff --git a/mpq/unit/cm/faction-t/tiangou-shadow.grp b/mpq/unit/cm/faction-t/tiangou-shadow.grp index 29964d8f..6574c130 100644 Binary files a/mpq/unit/cm/faction-t/tiangou-shadow.grp and b/mpq/unit/cm/faction-t/tiangou-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/tiangou-turret.grp b/mpq/unit/cm/faction-t/tiangou-turret.grp index 52daa62c..61c06f88 100644 Binary files a/mpq/unit/cm/faction-t/tiangou-turret.grp and b/mpq/unit/cm/faction-t/tiangou-turret.grp differ diff --git a/mpq/unit/cm/faction-z/hydralisk-orkoti-death.grp b/mpq/unit/cm/faction-z/hydralisk-orkoti-death.grp new file mode 100644 index 00000000..aa1f2b97 Binary files /dev/null and b/mpq/unit/cm/faction-z/hydralisk-orkoti-death.grp differ diff --git a/mpq/unit/cm/faction-z/hydralisk-orkoti.grp b/mpq/unit/cm/faction-z/hydralisk-orkoti.grp new file mode 100644 index 00000000..ed9db5d5 Binary files /dev/null and b/mpq/unit/cm/faction-z/hydralisk-orkoti.grp differ diff --git a/mpq/unit/cm/terran/tencendur-flag.grp b/mpq/unit/cm/terran/tencendur-flag.grp new file mode 100644 index 00000000..7b28380c Binary files /dev/null and b/mpq/unit/cm/terran/tencendur-flag.grp differ diff --git a/mpq/unit/cm/terran/tencendur-overlay-bg.grp b/mpq/unit/cm/terran/tencendur-overlay-bg.grp new file mode 100644 index 00000000..132f099f Binary files /dev/null and b/mpq/unit/cm/terran/tencendur-overlay-bg.grp differ diff --git a/mpq/unit/cm/terran/tencendur-overlay-ob.grp b/mpq/unit/cm/terran/tencendur-overlay-ob.grp new file mode 100644 index 00000000..a756afa9 Binary files /dev/null and b/mpq/unit/cm/terran/tencendur-overlay-ob.grp differ diff --git a/mpq/unit/cm/terran/tencendur-shadow.grp b/mpq/unit/cm/terran/tencendur-shadow.grp new file mode 100644 index 00000000..88607ab1 Binary files /dev/null and b/mpq/unit/cm/terran/tencendur-shadow.grp differ diff --git a/mpq/unit/cm/terran/tencendur.grp b/mpq/unit/cm/terran/tencendur.grp new file mode 100644 index 00000000..22325997 Binary files /dev/null and b/mpq/unit/cm/terran/tencendur.grp differ diff --git a/mpq/unit/cm/zerg/vorvrokor-birth.grp b/mpq/unit/cm/zerg/vorvrokor-birth.grp index 69e49022..18609b3e 100644 Binary files a/mpq/unit/cm/zerg/vorvrokor-birth.grp and b/mpq/unit/cm/zerg/vorvrokor-birth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 08c6b4ad..a4d2d23c 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 0f74d48f..59127c06 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 9bcfc400..00f10708 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 855b7aa0..8dab3377 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 a9c2288a..4f87773f 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -18,6 +18,7 @@ Our goals for the next patch (8 March 2025) include: - Further reduced desync rate (a. DF) - Fixed a crash case related to rescuable units (r. & c. DF) - **Gameplay:** + - **Khalendric Ashguard** now correctly benefits from Vengeful March (r. Londier) - **Futurist Cleric**s no longer provide **Nanoshield** (r. jakulangski) - **Performance:** - Movement speed calculations have been optimized, reducing performance cost of things like **Zoryusthaleth Swarming Omen** (c. DF) @@ -67,8 +68,14 @@ Our goals for the next patch (8 March 2025) include: - [Rotary](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/rotary): - Resource costs 200/75 » 175/75 - Build time 35 » 30 +- **NEW:** [Tencendur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tencendur): + - Heavy garrison; requires Atlas +- **NEW:** [Maverick (Futurist)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick-futurist): + - Futurist Federation: Maverick variant - **NEW:** [Blackjack (Golden)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack-golden): - Golden Republic: Blackjack variant +- **NEW:** [Eidolon (Nydus)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/eidolon-nydus): + - Nydus Trinity: Eidolon variant ## Protoss - [Mind Tyrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/mind-tyrant) **Revised!**: @@ -88,7 +95,10 @@ Our goals for the next patch (8 March 2025) include: - Movement speed 5 » 4.14 (17% slower) - **Sensory Overload:** - Weapon damage 1x15 » 1x10 +- [Cedent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cedent): + - Build time 25 » 20 - [Aquifer](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aquifer) and [Matrix](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/matrix): + - Build time 45 » 40 - Now requires a tier 1 production structure - [Crucible](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/crucible): - Now requires a tier 1 production structure @@ -133,4 +143,6 @@ Our goals for the next patch (8 March 2025) include: - **NEW:** [Zobriolisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zobriolisk): - Versatile assault strain; morphed from Lakizilisk, requires Ultrav Cavern - **NEW:** [Quazrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/quazrokor): - - Imicren Tendril: Quazilisk variant \ No newline at end of file + - Imicren Tendril: Quazilisk variant +- **NEW:** [Hydralisk (Orkoti)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk-orkoti): + - Orkoti Tendril: Hydralisk variant \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a5796df2..53650b4f 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ