diff --git a/master changelog.md b/master changelog.md index 43b81180..31dfb0ee 100644 --- a/master changelog.md +++ b/master changelog.md @@ -5,6 +5,8 @@ Since December 2022, this changelog shows only past changes. See patchnotes.md for info on the most recent patch! # Table of Contents +- [15 September 2025](#15-september-2025) +- [24 August 2025](#24-august-2025) - [10 August 2025](#10-august-2025) - [17 July 2025](#17-july-2025) - [20 June 2025](#20-june-2025) @@ -104,6 +106,211 @@ See patchnotes.md for info on the most recent patch! - [13 August 2020](#13-august-2020) - [12 August 2020](#12-august-2020) +# 15 September 2025 +## Year 3, month 9, patch 1 + +## Patch goals +- Continue balancing for all races +- Continue Askosi development +- Further improve audiovisuals and AI +- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! + +## Game Modes +- Renamed **Competitive** to **Unranked** + - **Ranked** mode is coming soon™! + +## Bugfixes +- **Stability:** + - Improved floating point safety to further reduce desyncs (c. Veeq7) + - Resolved a crash when certain types of graphics were drawn after the Monument of Sin was warped in (r. Sosij & OyA, c. DF) + - Score screen freezes should be resolved, though those replays will freeze during playback -- send them to us with info! + - Resolve a Zerg AI freeze (r. Solstice & others) + - Fixed rare crash when **Cohort**s self-revive at the unit limit (r. sharktemplar) + - Fixed rare crash when **Matraleth**-spawned **Vilgoleth**s were attempted to be made at the unit limit +- **Gameplay:** + - Resolved issues with **Swarming Omen** not correctly applying to flingy units, and incorrectly applying to FFA hostiles (r. GreenEggs'NSpam) + - Improved Artisan responsivity (not completely epic yet, still working on it) + - Fix pneumonic hotkey mismatch for **Lobotomy Mine** detonation (r. Kenoli) +- **Audiovisual:** + - Fixed wonky birth and mutation animations for the Izirokor (c. Solstice) + - Fixed bad minimap color for revealed neutral structures and defeated units + - Fixed bad requirement strings for Tarasque and Luminary + - Corrected Matrix selection circle + - Fixed bad death animation for Konvilisk + - Added **Miasma** passive icons & tooltips to **Kagralisk** and **Cherbrathalor** (r. Raenarill) + - Fixed **Swarming Omen** speed boost not always appearing on the armor tooltip (r. GreenEggs'NSpam) + - Fixed **Golden Republic Blackjack** build icon missing before Scrapyard completion (r. SgzzZ) + - Added **Brontes Payload** icon to **Futurist Cyclops** (r. Raenarill) +- **AI:** + - AI-controlled **Seraph**s will no longer cast **Irradiate** on allies (r. Vilius & jakulangski) + - Improved Zerg structure mutation and Hachirosk priorities, resolving some build order bugs + +## Audiovisuals +- Smoothed camera follow for units (not pixel-perfect, yet...) (c. DF) +- New models for: + - **Matador** (c. Solstice) + - **Artisan** (c. DeltaCadimus) +- Modified models for: + - **Madrigal** (material updates) + - **Legionnaire** and **Izirokor** (slight size increases, c. Solstice) + - **Architect** (fixed engine, improved player color + muzzleflash) +- New portrait for: + - **Izirokor** (c. Solstice) +- New wireframe for: + - **Izirokor** (c. jun3hong) +- New icons for: (c. Raenarill) + - **Burst Lasers** (Wraith) + - **Perpetual Wind** (Axitrilisk), **Reconstitution** (Vilgorokor), Screaming Venom (Keskathalor) +- New SFX for: + - **Stockade** (training ambience) + - **Bulwark** (passive proc) + - **Crucible** (ambience) + +## Terran +- [Eidolon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/eidolon): + - HP 65 » 70 + - **Coroner Rifle:** + - Now fires a fast projectile to indicate directionality + - Weapon cooldown 1.2 » 1 + - Weapon windup 0 » 0.66 +- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador): + - **NEW: Fore Castle** + - While in Tank Mode, now gains +2 armor when facing attackers. +- [Cestus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cestus): + - Vision range 9 » 11 +- **NEW:** [Hecaton Vulture](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture-hecaton): + - Factional variant that lays [Tartarus Mines](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tartarus-mine) instead of Lobotomy Mines +- **NEW:** [Hecaton Madrigal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madrigal-hecaton): + - Factional variant that **Incinerate**s ground and air units while in **Imperioso Mode** + +## Protoss +- [Dracadin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/dracadin) and [Hierophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/hierophant): + - Transport space 4 » 3 +- [Bulwark](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/bulwark): + - Vision range 9 » 11 + - Now benefits from **Crucible Khaydarin Charge** + +## Zerg +- [Ovileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ovileth): + - Resource costs 75/50 » 100/25 + - Build time 22 » 20 +- [Cagrant Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cagrant-cesiant), [Surkith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant), and [Skortrith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skortrith-cesiant: + - Vision range 10 » 9 +- [Kazitrith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant): + - Vision range 10 » 11 +- [Ocsal Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ocsal-cesiant): + - Vision range 9 » 8 + +# 24 August 2025 +## Year 3, month 8, patch 2 + +## Patch goals +- Continue post-change balancing for all races +- Implement advanced constructors for all races +- Continue Askosi development +- Improve audiovisuals and AI +- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! + +## Config +- A new advisor, **Goku**, has been added! (c. 3crow) +- The advisors **Mesk** and **ISN** have been deprecated by author request. If you get an error message on launch, consider removing them from your configs. + +## Bugfixes +- **Stability:** + - Resolved a common crash after warping in a Monument of Sin (r. HitEmUp & Sosij, c. DF) +- **Gameplay:** + - Fixed **Liiralisk** bounces being able to bounce to airborne enemies + - Prevented **Autovitality** timers from expiring while stunned (r. Kasuga) +- **AI:** + - Resolved an issue preventing Zerg AI from making **Axtoth Axis** and related units (r. GreenEggs'NSpam) + - Resolved issues with Zerg AI attack wave creation +- **Audiovisual:** + - Enabled construction init SFX for Zerg gas caps + - Fixed icon display for **Solarion** hangar (r. jakulangski, c. DF) + - Corrected filenames for a few miscellaneous sound files (r. Mimika) + +## Audiovisuals +- New model for: + - **Legionnaire** *(c. Solstice, wireframe c. jun3hong)* + - **Izirokor** +- New portrait for: + - **Legionnaire** *(c. Solstice)* +- Improved overlay visuals for: + - **Savant - Power Siphon** + +## Triggers +- Added the following behaviors to the `set_unit_behavior` crig action: + - `no_collision` -- the unit will not collide with other ground units + - `air_transport` -- if the unit is a transport, it can transport air units + +## Terran +- [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos): + - **Fusion Sealers** removed +- [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant): + - Resource costs 100/50 » 125/50 + - **Discoid Rifle:** + - **Power Siphon** attack cooldown 0.75 » 0.83 (matches **Entropy Gauntlets**) +- [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack): + - Build time 18 » 16 +- [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx): + - Build time 28 » 30 +- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): + - Build time 30 » 25 + - **Halo Rockets:** + - Weapon cooldown 1.08 » 0.92 + - Weapon range 6 » 7 + - Weapon still fired at 6 range, improving chase potential +- [Ancile](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ancile): + - Vision range 10 » 8 +- [Salamander](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/salamander): + - **Perdition Barrage:** + - Attack count 3 » 6 +- [Vestry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vestry): + - Resource costs 150/75 » 150/50 +- [Covenant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/covenant): + - Resource costs 100/250 » 100/350 +- **NEW:** [Ogun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ogun): + - Sturdy constructor with a repair-oriented deployment and **Fusion Sealers** + - Trained from Ministry or Treasury; requires Quarry +- **NEW:** [Cannibal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cannibal): + - **Upstart only!** Raiding infantry; replaces Cyprian + +## Protoss +- [Witness](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/witness): + - Resource costs 50/75 » 50/50 +- **NEW:** [Autocort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/autocort): + - Advanced constructor with personal power field + - Trained from Embassy + +## Zerg +- [Gosvileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gosvileth): + - **Plethoral Gestation** removed + - **NEW: Aberrant Gestation:** + - Gosvileths now mutate into advanced structure strains +- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk): + - Resource costs 75/25 » 100/25 + - **Hollowed Glaves:** + - Armor penetration 2 » 1 + - **Homing Spore:** + - Armor penetration 0 » 1 +- [Sovroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sovroleth): + - Build time 25 » 24 + - **Corpse Cocoon:** + - Gestation time 4 » 12 (half of training time) +- [Sasyrvoleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sasyrvoleth): + - Resource costs 100/200 » 100/300 + - Build time 30 » 40 + - HP 140 » 200 + - Movement speed 5 » 4.16 +- [Zarcavrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zarcavrokor): + - Movement speed 5.4 » 4.2 +- [Kalkiir Lake](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kalkiir-lake): + - Resource costs 200/100 » 200/200 + - Time cost 40 » 50 +- **NEW:** [Agrileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/agrileth): + - Mobile hive organ; has **Plethoral Gestation** + - Morphed from Larvae; requires Quazeth Pool or mutation + # 10 August 2025 ## Year 3, month 8, patch 1 diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e337ba7a..9ecc2b95 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 b1d278ed..d669093f 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -1,4 +1,4 @@ -Skryling +Skryrokor Rilirokor Infested Terran Cocoon @@ -282,7 +282,7 @@ Salamander Torpedo Sanctum of Sorrow Geszkath Grotto Shaman (Support Mode) -Alkaj Chasm +Kethraj Keep Idol Golem Barghest @@ -506,7 +506,7 @@ Spoke Shell Adherent Extatus Nathrelisk -Iziralisk +Unused Anchor (Grounded) Carapace Swarm (Small) Chokralgant Chazsal @@ -595,7 +595,7 @@ Madrigal Turret (Hecaton, Furia) Rove Burst Lasers Green Impact Burst Lasers Cyan Impact -Extended Flingy #389 +Kethrostalor Extended Flingy #390 Extended Flingy #391 Francisco Goska diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index c7dce320..d3c49f4c 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 ca5fddd1..63295cac 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 d8f86456..f156897e 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1178,8 +1178,8 @@ Geszkath Grotto Geszkath Grotto Shadow Oberon Shadow Oberon Engines -Alkaj Chasm -Alkaj Chasm Shadow +Kethraj Keep +Kethraj Keep Shadow Idol Idol Shadow Golem @@ -1798,10 +1798,10 @@ Extatus Engines Nathrelisk Nathrelisk Shadow Nathrelisk Birth -Iziralisk -Iziralisk Shadow -Iziralisk Birth -Iziralisk Remains +Unused +Unused +Unused +Unused Anchor (Grounded) Anchor (Grounded) Shadow Carapace Swarm (Small) @@ -2110,62 +2110,62 @@ Rove Rove Shadow Burst Lasers Green Impact Burst Lasers Cyan Impact -Extended Image #1110 -Extended Image #1111 -Extended Image #1112 -Extended Image #1113 -Extended Image #1114 -Extended Image #1115 -Extended Image #1116 -Extended Image #1117 -Extended Image #1118 -Extended Image #1119 -Extended Image #1120 -Extended Image #1121 -Extended Image #1122 -Extended Image #1123 -Extended Image #1124 -Extended Image #1125 -Extended Image #1126 -Extended Image #1127 -Extended Image #1128 -Extended Image #1129 -Extended Image #1130 -Extended Image #1131 -Extended Image #1132 -Extended Image #1133 -Extended Image #1134 -Extended Image #1135 -Extended Image #1136 -Extended Image #1137 -Extended Image #1138 -Extended Image #1139 -Extended Image #1140 -Extended Image #1141 -Extended Image #1142 -Extended Image #1143 -Extended Image #1144 -Extended Image #1145 -Extended Image #1146 -Extended Image #1147 -Extended Image #1148 -Extended Image #1149 -Extended Image #1150 -Extended Image #1151 -Extended Image #1152 -Extended Image #1153 -Extended Image #1154 -Extended Image #1155 -Extended Image #1156 -Extended Image #1157 -Extended Image #1158 -Extended Image #1159 -Extended Image #1160 -Extended Image #1161 -Extended Image #1162 -Extended Image #1163 -Extended Image #1164 -Extended Image #1165 +Legionnaire Warp Flash +Golem Warp Flash +Hierophant Warp Flash +Simulacrum Warp Flash +Vassal Warp Flash +Manifold Warp Flash +Idol Warp Flash +Artisan Warp Flash +Archon Warp Flash +Autocort Warp Flash +Cabalist Warp Flash +Amaranth Warp Flash +Atreus Warp Flash +Oscilliant Warp Flash +Herald Warp Flash +Vagrant Warp Flash +Charlatan Warp Flash +Ecclesiast Warp Flash +Barghest Warp Flash +Lanifect Warp Flash +Aurora Warp Flash +Gladius Warp Flash +Exemplar Warp Flash +Servitor Warp Flash +Positron Warp Flash +Clarion Warp Flash +Archon Being Warp Flash +Mind Tyrant Warp Flash +Mind Tyrant Being Warp Flash +Kethrostalor +Kethrostalor Shadow +Pariah Warp Flash +Potentate Warp Flash +Sycophant Warp Flash +Unar Warp Flash +Architect Warp Flash +Vibrance Warp Flash +Adherent Warp Flash +Magister Warp Flash +Epigraph Warp Flash +Empyrean Warp Flash +Optecton Warp Flash +Patriarch Warp Flash +Analogue Warp Flash +Demiurge Warp Flash +Empress Warp Flash +Star Sovereign Warp Flash +Anthelion Warp Flash +Ecclesiast Warp Flash (Khalendric) +Ashguard Warp Flash +Dracadin Warp Flash (Order) +Renesair Warp Flash +Extatus Warp Flash +Cicatus Warp Flash +Zealot Warp Flash (Starbound) +Manifold Warp Flash (Starbound) Extended Image #1166 Extended Image #1167 Extended Image #1168 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index b403621f..a7f47a42 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 925d6e21..430b1a56 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3624,47 +3624,47 @@ Egg Ambient 02 Egg Ambient 03 Egg Ambient 04 Treasury Ambient 01 -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 -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 -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 +Cyprian Windup 01 +Cyprian Windup 02 +Cyprian Windup 03 +Terran Unit Deployment 01 +Protoss Unit Deployment 01 +Protoss Unit Deployment 02 +Protoss Unit Deployment 03 +Protoss Unit Deployment 04 +Optecton Windup 01 +Optecton Windup 02 +Optecton Windup 03 +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 +Kethraj Keep What 01 +Gorgrokor Death 01 +Gorgrokor Death 02 +Kethrostalor Weaponfire 01 +Kethrostalor Weaponfire 02 +Kethrostalor Weaponfire 03 +Kethrostalor Weaponhit 01 +Kethrostalor Weaponhit 02 +Kethrostalor Weaponhit 03 +Kethrostalor Weaponhit 04 +Kethrostalor Weaponhit 05 +Ultrokor Consume 01 +Ultrokor Consume 02 +Ultrokor Consume 03 +Askosi Scrap 01 +Askosi Scrap 02 +Askosi Scrap 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 65f64487..0bdd3eb7 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 @@ -3623,4 +3623,44 @@ cm\z\egg\amb-01.wav cm\z\egg\amb-02.wav cm\z\egg\amb-03.wav cm\z\egg\amb-04.wav -cm\t\_building\treasury\amb-01.wav \ No newline at end of file +cm\t\_building\treasury\amb-01.wav +cm\t\cyprian\windup-01.wav +cm\t\cyprian\windup-02.wav +cm\t\cyprian\windup-03.wav +cm\t\_building\t-unit-deploy-01.wav +cm\p\_building\p-unit-deploy-01.wav +cm\p\_building\p-unit-deploy-02.wav +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 +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 +cm\z\gorgrokor\dth-01.wav +cm\z\gorgrokor\dth-02.wav +cm\z\kethrostalor\wf-01.wav +cm\z\kethrostalor\wf-02.wav +cm\z\kethrostalor\wf-03.wav +cm\z\kethrostalor\wh-01.wav +cm\z\kethrostalor\wh-02.wav +cm\z\kethrostalor\wh-03.wav +cm\z\kethrostalor\wh-04.wav +cm\z\kethrostalor\wh-05.wav +cm\z\ultrokor\eat-01.wav +cm\z\ultrokor\eat-02.wav +cm\z\ultrokor\eat-03.wav +cm\a\scrap-01.wav +cm\a\scrap-02.wav +cm\a\scrap-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a0867aa5..6008eec6 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 993325c3..cc9e4849 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -591,7 +591,7 @@ Atreus Amaranth Geszkath Grotto Shaman (Support Mode) -Alkaj Chasm +Kethraj Keep Idol Golem Salamander Missile Impact @@ -896,7 +896,7 @@ Spoke Shell Adherent Extatus Nathrelisk -Iziralisk +Unused Anchor (Grounded) Carapace Swarm (Small) Fusion Cutter Hit Damageless @@ -1044,7 +1044,7 @@ Madrigal Turret (Hecaton, Furia) Rove Burst Lasers Green Impact Burst Lasers Cyan Impact -Extended Sprite #530 +Kethrostalor Extended Sprite #531 Extended Sprite #532 Extended Sprite #533 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 50076d46..c62d2b54 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 16b2fa4d..37353fe7 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -210,7 +210,7 @@ Right Pit Door Terran Sentinel Spliced Tarasque Terran Anticthon -Zerg Alkaj Chasm +Zerg Kethraj Keep Terran Atelier Start Location Terran Treasury @@ -508,8 +508,8 @@ Terran Vulture (Hecaton) Terran Tartarus Mine (Hecaton) Terran Madrigal (Hecaton, Furia) Madrigal Turret (Hecaton, Furia) -Extended Unit #283 -Extended Unit #284 +Askosi Bounty +Zerg Azanthrokor (Orkoti) Extended Unit #285 Extended Unit #286 Extended Unit #287 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 70990cae..c2e8c163 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 757424dc..83021e5d 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -242,7 +242,7 @@ Asoni Carbine (Blackguard) Phlegethon Cannons (Arhaun) Homing Spore (Liiralisk) Zulu Sidekicks (Cannibal) -Extended Weapon #115 +Staggered Spores (Kethrostalor) Extended Weapon #116 Extended Weapon #117 Extended Weapon #118 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index d843e84a..10f2740e 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 16b7281e..3b35e1a2 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 eb01c56c..18f9c820 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 722f8c10..c761923e 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 746448bf..ee1c4735 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 81cc39b9..08a7e0ba 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 5ccd1981..79eea0c6 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index f67328ef..2f34f3ba 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 27d8031c..4e79d5dd 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -299,7 +299,7 @@ DidactWarpIn: # 134 Archon Energy (protoss\archon.grp) .headerstart IsId 147 -Type 13 +Type 21 Init ArchonEnergyInit Death ArchonEnergyDeath GndAttkInit ArchonEnergyGndAttkInit @@ -314,6 +314,14 @@ Unused2 [NONE] Walking ArchonEnergyGndAttkInit WalkingToIdle ArchonEnergyGndAttkInit SpecialState1 ArchonEnergySpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ArchonWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -429,12 +437,16 @@ ArchonEnergyLocal00: wait 2 goto ArchonEnergyLocal00 +ArchonWarpIn: + imgol 2120 0 0 # Archon Warp Flash (protoss\archon.grp) + goto ArchonEnergyGndAttkInit + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 135 Archon Being (protoss\archonT.grp) .headerstart IsId 148 -Type 12 +Type 21 Init ArchonBeingInit Death Generic_Wait1End GndAttkInit ArchonBeingGndAttkInit @@ -449,6 +461,14 @@ Unused2 [NONE] Walking ArchonBeingGndAttkToIdle WalkingToIdle ArchonBeingGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ArchonBeingWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -527,6 +547,10 @@ ArchonBeingLocal00: gotorepeatattk goto ArchonBeingGndAttkToIdle +ArchonBeingWarpIn: + imgol 2138 0 0 # Archon Being Warp Flash (protoss\archonT.grp) + goto ArchonBeingGndAttkToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 136 Archon Swirl (protoss\archonT2.grp) @@ -908,7 +932,7 @@ DracadinWalking: DracadinWarpIn: imgol 125 0 0 # Dracadin Warp Flash (protoss\dragoon.grp) - goto SkryrokorLocal00 + goto DracadinWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1114,7 +1138,7 @@ EnvoyWalking: EnvoyWarpIn: imgol 121 0 0 # Envoy Warp Flash (protoss\shuttle.grp) - goto SkryrokorLocal00 + goto EnvoyWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1276,7 +1300,7 @@ CantavisWalkingToIdle: CantavisWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + goto CantavisWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1377,7 +1401,7 @@ AccantorWalking: AccantorWarpIn: imgol 146 0 0 # Accantor Warp Flash (protoss\trilob.grp) - goto SkryrokorLocal00 + goto AccantorWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1608,7 +1632,7 @@ ZealotWalking: ZealotWarpIn: imgol 154 0 0 # Zealot Warp Flash (protoss\zealot.grp) - goto ZealotLocal00 + goto ZealotWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1690,7 +1714,7 @@ WitnessWalking: WitnessWarpIn: imgol 150 0 0 # Witness Warp Flash (protoss\witness.grp) - goto SkryrokorLocal00 + goto SolarionLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -3352,12 +3376,6 @@ Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # -WarpFlashHeaderInit: - playfram 0x00 - wait 1 - followmaingraphic - goto SkryrokorLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 210 Warp Texture (protoss\texture.grp) @@ -4725,7 +4743,7 @@ GenericRemnantsFourDeath: # 925 Mind Tyrant Energy (protoss\darchn.grp) .headerstart IsId 365 -Type 13 +Type 21 Init MindTyrantEnergyInit Death MindTyrantEnergyDeath GndAttkInit MindTyrantEnergyGndAttkInit @@ -4740,6 +4758,14 @@ Unused2 MindTyrantEnergyUnused2 Walking MindTyrantEnergyGndAttkInit WalkingToIdle MindTyrantEnergyGndAttkInit SpecialState1 MindTyrantEnergySpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn MindTyrantEnergyWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -4860,12 +4886,16 @@ MindTyrantEnergyLocal00: wait 2 goto MindTyrantEnergyLocal00 +MindTyrantEnergyWarpIn: + imgol 2139 0 0 # Mind Tyrant Warp Flash (protoss\darchon.grp) + goto MindTyrantEnergyGndAttkInit + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 926 Mind Tyrant Being (protoss\darchnT.grp) .headerstart IsId 366 -Type 12 +Type 21 Init MindTyrantBeingInit Death Generic_Wait1End GndAttkInit MindTyrantBeingGndAttkInit @@ -4880,6 +4910,14 @@ Unused2 SkryrokorLocal00 Walking MindTyrantBeingGndAttkToIdle WalkingToIdle MindTyrantBeingGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn MindTyrantBeingWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -4953,6 +4991,10 @@ MindTyrantBeingCastSpell: gotorepeatattk goto MindTyrantBeingGndAttkToIdle +MindTyrantBeingWarpIn: + imgol 2140 0 0 # Mind Tyrant Being Warp Flash (protoss\darchonT.grp) + goto MindTyrantBeingGndAttkToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 927 Mind Tyrant Swirl (protoss\darchnT2.grp) @@ -5130,8 +5172,8 @@ LanifectWalking: goto SkryrokorLocal00 LanifectWarpIn: - imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto SkryrokorLocal00 + imgol 2131 0 0 # Lanifect Warp Flash (cm\protoss\lanifect.grp) + goto LanifectGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -5217,7 +5259,7 @@ Unknown371Death: # 933 Cabalist (protoss\dtemplar.grp) .headerstart IsId 372 -Type 12 +Type 21 Init CabalistInit Death CabalistDeath GndAttkInit CabalistGndAttkInit @@ -5232,6 +5274,14 @@ Unused2 [NONE] Walking CabalistWalking WalkingToIdle CabalistGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn CabalistWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -5321,6 +5371,10 @@ CabalistWalking: playfram 0x121 goto CabalistWalking +CabalistWarpIn: + imgol 2122 0 0 # Cabalist Warp Flash (protoss\dtemplar.grp) + goto CabalistGndAttkToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 964 Neutron Flare (thingy\PcsSplsh.grp) @@ -5430,7 +5484,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn ExemplarWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -5482,6 +5536,10 @@ ExemplarWalking: imgol 1202 0 0 # Exemplar Engines (cm\protoss\exemplar-engine.grp) goto SkryrokorLocal00 +ExemplarWarpIn: + imgol 2134 0 0 # Exemplar Warp Flash (cm\protoss\exemplar.grp) + goto ExemplarWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 973 Mind Control Hit (Small) (thingy\PDaMyoSm.grp) @@ -5873,7 +5931,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn AuroraWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -5923,6 +5981,10 @@ AuroraWalking: setvertpos 0 imgol 1199 0 0 # Aurora Engines (cm\protoss\aurora-engine.grp) goto SkryrokorLocal00 + +AuroraWarpIn: + imgol 2132 0 0 # Aurora Warp Flash (cm\protoss\aurora.grp) + goto AuroraWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -5951,7 +6013,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn PanoptusWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -5995,6 +6057,10 @@ PanoptusWalking: setvertpos 0 imgol 142 0 0 # Panoptus Engines (thingy\pscGlow.grp) goto SkryrokorLocal00 + +PanoptusWarpIn: + imgol 143 0 0 # Panoptus Warp Flash (cm\protoss\panoptus.grp) + goto PanoptusWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6167,8 +6233,8 @@ SimulacrumWalking: goto SimulacrumWalking SimulacrumWarpIn: - imgol 125 0 0 # Simulacrum Warp Flash (protoss\simulacrum.grp) - goto SkryrokorLocal00 + imgol 2115 0 0 # Simulacrum Warp Flash (protoss\simulacrum.grp) + goto SimulacrumWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6236,7 +6302,7 @@ EmpyreanWalking: goto SkryrokorLocal00 EmpyreanWarpIn: - imgol 143 0 0 # Empyrean Warp Flash (protoss\empyrean.grp) + imgol 2152 0 0 # Empyrean Warp Flash (cm\protoss\empyrean.grp) goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # @@ -6469,7 +6535,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn ZealotWarpIn +WarpIn ZealotStarboundWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -6478,6 +6544,10 @@ ZealotStarboundGndAttkInit: wait 1 goto ZealotWalkingToIdle +ZealotStarboundWarpIn: + imgol 2166 0 0 # Zealot (Starbound) Warp Flash (cm\faction-p\zealot-starbound.grp) + goto ZealotWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1973 Cedent (cm\protoss\cedent.grp) @@ -6565,7 +6635,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn ExtatusWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -6579,6 +6649,10 @@ ExtatusWalking: imgol 1199 0 0 # Extatus Engines (cm\faction-p\extatus-engine.grp) goto SkryrokorLocal00 +ExtatusWarpIn: + imgol 2164 0 0 # Extatus Warp Flash (cm\faction-p\extatus.grp) + goto AuroraWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1987 Unar Orbital (cm\protoss\unar-orbital.grp) @@ -6624,13 +6698,17 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn DracadinWarpIn +WarpIn DracadinOrderWarpIn .headerend # ----------------------------------------------------------------------------- # DracadinOrderInit: imgul 2002 0 0 # Dracadin Order Shadow (faction-p\dracadin-order-shadow.grp) goto DracadinWalkingToIdle + +DracadinOrderWarpIn: + imgol 2162 0 0 # Dracadin (Order) Warp Flash (cm\faction-p\dracadin-order.grp) + goto DracadinWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6782,8 +6860,8 @@ StarSovereignWalking: goto SkryrokorLocal00 StarSovereignWarpIn: - imgol 143 0 0 # Star Sovereign Warp Flash (protoss\starsovereign.grp) - goto SkryrokorLocal00 + imgol 2158 0 0 # Star Sovereign Warp Flash (protoss\starsovereign.grp) + goto StarSovereignWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7073,7 +7151,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn GladiusWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -7118,6 +7196,10 @@ GladiusWalking: imgol 1204 0 0 # Gladius Engines (cm\protoss\gladius-engine.grp) playfram 0x00 goto SkryrokorLocal00 + +GladiusWarpIn: + imgol 2133 0 0 # Gladius Warp Flash (cm\protoss\gladius.grp) + goto GladiusWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7146,7 +7228,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn MagisterWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -7199,6 +7281,10 @@ MagisterWalking: playfram 0x00 setvertpos 0 goto SkryrokorLocal00 + +MagisterWarpIn: + imgol 2150 0 0 # Magister Warp Flash (cm\protoss\magister.grp) + goto MagisterWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7227,7 +7313,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn VassalWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -7274,6 +7360,10 @@ VassalWalking: playfram 0x00 imgol 1206 0 0 # Vassal Engines (cm\protoss\vassal-engine.grp) goto SkryrokorLocal00 + +VassalWarpIn: + imgol 2116 0 0 # Vassal Warp Flash (cm\protoss\vassal.grp) + goto VassalWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7570,8 +7660,8 @@ AtreusWalking: goto AtreusWalking AtreusWarpIn: - imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2124 0 0 # Atreus Warp Flash (cm\protoss\atreus.grp) + goto AtreusGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7715,8 +7805,8 @@ AmaranthWalkingToIdle: goto SkryrokorLocal00 AmaranthWarpIn: - imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2123 0 0 # Amaranth Warp Flash (cm\protoss\amaranth.grp) + goto AmaranthWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7835,15 +7925,15 @@ EcclesiastWalking: goto EcclesiastWalking EcclesiastWarpIn: - imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2129 0 0 # Ecclesiast Warp Flash (cm\protoss\ecclesiast.grp) + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1182 Idol (cm\protoss\idol.grp) .headerstart IsId 498 -Type 12 +Type 21 Init IdolInit Death IdolDeath GndAttkInit IdolGndAttkInit @@ -7858,6 +7948,14 @@ Unused2 [NONE] Walking IdolWalking WalkingToIdle IdolGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn IdolWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -7942,13 +8040,17 @@ IdolWalking: wait 1 playfram 0x1ba goto IdolWalking + +IdolWarpIn: + imgol 2118 0 0 # Idol Warp Flash (cm\protoss\idol.grp) + goto IdolGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1184 Golem (golem.grp) .headerstart IsId 499 -Type 12 +Type 21 Init GolemInit Death GolemDeath GndAttkInit GolemGndAttkInit @@ -7963,6 +8065,14 @@ Unused2 [NONE] Walking LegionnaireWalking WalkingToIdle GolemWalkingToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn GolemWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -8007,13 +8117,17 @@ GolemGndAttkRpt: GolemWalkingToIdle: playfram 0x00 goto SkryrokorLocal00 + +GolemWarpIn: + imgol 2113 0 0 # Golem Warp Flash (cm\protoss\golem.grp) + goto GolemWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1186 Barghest (cm\protoss\barghest.grp) .headerstart IsId 500 -Type 12 +Type 21 Init BarghestInit Death BarghestDeath GndAttkInit BarghestGndAttkInit @@ -8028,6 +8142,14 @@ Unused2 [NONE] Walking BarghestWalking WalkingToIdle BarghestGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn BarghestWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -8096,6 +8218,10 @@ BarghestWalking: wait 1 goto BarghestWalking +BarghestWarpIn: + imgol 2130 0 0 # Barghest Warp Flash (cm\protoss\barghest.grp) + goto BarghestGndAttkToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1188 Synthetic Synod (cm\protoss\synthetic-synod.grp) @@ -8334,8 +8460,8 @@ PariahWalking: goto PariahWalking PariahWarpIn: - imgol 125 0 0 # Pariah Warp Flash (protoss\pariah.grp) - goto SkryrokorLocal00 + imgol 2143 0 0 # Pariah Warp Flash (cm\protoss\pariah.grp) + goto PariahWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -8630,8 +8756,8 @@ ManifoldWalkingToIdle: goto ManifoldGndAttkToIdle ManifoldWarpIn: - imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto ManifoldGndAttkToIdle + imgol 2117 0 0 # Manifold Warp Flash (cm\protoss\manifold.grp) + goto ManifoldWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -8660,7 +8786,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn ArchitectWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -8710,6 +8836,10 @@ ArchitectWalking2: wait 1 goto ArchitectWalking2 +ArchitectWarpIn: + imgol 2147 0 0 # Architect Warp Flash (cm\protoss\architect.grp) + goto ArchitectWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1244 Recall Field Final (thingy\recall.grp) @@ -9715,8 +9845,8 @@ HierophantWalking: goto HierophantWalking HierophantWarpIn: - imgol 125 0 0 # Dracadin Warp Flash (protoss\dragoon.grp) - goto SkryrokorLocal00 + imgol 2114 0 0 # Hierophant Warp Flash (protoss\hierophant.grp) + goto HierophantWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9833,7 +9963,7 @@ ClarionWalking: goto ClarionWalking ClarionWarpIn: - imgol 133 0 0 # Didact Warp Flash (protoss\didact.grp) + imgol 2137 0 0 # Clarion Warp Flash (cm\protoss\clarion.grp) goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # @@ -9931,8 +10061,8 @@ LegionnaireWalking: goto LegionnaireWalking LegionnaireWarpIn: - imgol 154 0 0 # Zealot Warp Flash (protoss\zealot.grp) - goto SkryrokorLocal00 + imgol 2112 0 0 # Legionnaire Warp Flash (cm\protoss\legionnaire.grp) + goto GolemWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10054,7 +10184,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn PariahWarpIn +WarpIn DemiurgeWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -10099,6 +10229,10 @@ DemiurgeGndAttkInit: DemiurgeGndAttkToIdle: wait 1 goto PariahWalkingToIdle + +DemiurgeWarpIn: + imgol 2156 0 0 # Demiurge Warp Flash (cm\protoss\demiurge.grp) + goto PariahWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10127,7 +10261,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn EcclesiastWarpIn +WarpIn CharlatanWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -10135,6 +10269,10 @@ CharlatanInit: imgul 1172 0 0 # Charlatan Shadow (cm\protoss\charlatan-shad.grp) goto InfestedTerranWalkingToIdle +CharlatanWarpIn: + imgol 2128 0 0 # Charlatan Warp Flash (cm\protoss\charlatan.grp) + goto InfestedTerranWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1383 Neutron Flare (Silent) (thingy\PcsSplsh.grp) @@ -10443,8 +10581,8 @@ AnthelionWalking: goto AnthelionWalking AnthelionWarpIn: - imgol 143 0 0 # Anthelion Warp Flash - goto AnthelionLocal00 + imgol 2159 0 0 # Anthelion Warp Flash (cm\protoss\anthelion.grp) + goto AnthelionWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10710,7 +10848,7 @@ MonumentOfSinWarpIn: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1098 Empress (cm\shared\empress.grp) +# 1098 Empress (cm\protoss\empress.grp) .headerstart IsId 617 Type 21 @@ -10740,7 +10878,7 @@ WarpIn EmpressWarpIn # ----------------------------------------------------------------------------- # EmpressInit: - imgul 1437 0 42 # Empress Shadow (cm\shared\empress.grp) + imgul 1437 0 42 # Empress Shadow (cm\protoss\empress.grp) EmpressGndAttkToIdle: playfram 0x00 EmpressWalkingToIdle: @@ -10774,12 +10912,12 @@ EmpressGndAttkInit: EmpressWalking: setvertpos 0 - #imgol 1203 0 0 # Empress Engines (cm\shared\empress-engine.grp) + #imgol 1203 0 0 # Empress Engines (cm\protoss\empress-engine.grp) goto SkryrokorLocal00 EmpressWarpIn: - imgol 143 0 0 # Empress Warp Flash (shared\empress.grp) - goto SkryrokorLocal00 + imgol 2157 0 0 # Empress Warp Flash (cm\protoss\empress.grp) + goto EmpressWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11404,8 +11542,8 @@ ArtisanAlmostBuilt: goto ArtisanAlmostBuilt ArtisanWarpIn: - imgol 139 0 0 # Artisan Warp Flash (protoss\probe.grp) - goto SkryrokorLocal00 + imgol 2119 0 0 # Artisan Warp Flash (cm\protoss\artisan.grp) + goto ArtisanWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12172,8 +12310,8 @@ VagrantGndAttkRpt: goto EcclesiastGndAttkToIdle VagrantWarpIn: - imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2127 0 0 # Vagrant Warp Flash (cm\protoss\vagrant.grp) + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12371,8 +12509,8 @@ HeraldWalkingToIdle: goto HeraldLocal00 HeraldWarpIn: - imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2126 0 0 # Herald Warp Flash (cm\protoss\herald.grp) + goto HeraldWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12401,7 +12539,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn EpigraphWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -12471,6 +12609,10 @@ EpigraphWalking: playfram 0x00 goto EpigraphLocal00 +EpigraphWarpIn: + imgol 2151 0 0 # Epigraph Warp Flash (cm\protoss\epigraph.grp) + goto EpigraphWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1639 Unitary Union (cm\protoss\unitary-union.grp) @@ -12547,7 +12689,7 @@ UnitaryUnionWarpIn: # 1660 Servitor (cm\protoss\servitor.grp) .headerstart IsId 718 -Type 12 +Type 21 Init ServitorInit Death ServitorDeath GndAttkInit ServitorGndAttkInit @@ -12562,6 +12704,14 @@ Unused2 [NONE] Walking ServitorWalking WalkingToIdle ServitorWalkingToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ServitorWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -12613,12 +12763,16 @@ ServitorWalking: setvertpos 0 goto InfestedTerranWalkingToIdle +ServitorWarpIn: + imgol 2135 0 0 # Servitor Warp Flash (cm\protoss\servitor.grp) + goto ServitorWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1660 Positron (cm\protoss\positron.grp) .headerstart IsId 719 -Type 12 +Type 21 Init PositronInit Death PositronDeath GndAttkInit PositronGndAttkInit @@ -12633,6 +12787,14 @@ Unused2 [NONE] Walking PositronWalking WalkingToIdle PositronWalkingToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn PositronWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -12684,6 +12846,10 @@ PositronWalking: setvertpos 0 goto InfestedTerranWalkingToIdle +PositronWarpIn: + imgol 2136 0 0 # Positron Warp Flash (cm\protoss\positron.grp) + goto PositronWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1664 Anti-Matter Missile Hit (Damaging) (thingy\HKexplod.grp) @@ -12868,8 +13034,8 @@ SycophantWalking: goto SycophantWalking SycophantWarpIn: - imgol 154 0 0 # Sycophant Warp Flash (protoss\zealot.grp) - goto SycophantLocal00 + imgol 2145 0 0 # Sycophant Warp Flash (cm\protoss\sycophant.grp) + goto SycophantWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13001,11 +13167,15 @@ OptectonGndAttkRpt: wait 1 nobrkcodestart wait 1 - playsnd 1557 # Architect charge 01 + playsndbtwn 3634 3636 # Optecton charge 01, 02, 03 imgol 1820 0 0 # Architect charge overlay - wait 7 + wait 8 imgol 1820 0 0 # Architect charge overlay - wait 7 + wait 8 + imgol 1820 0 0 # Architect charge overlay + wait 8 + imgol 1820 0 0 # Architect charge overlay + wait 8 imgol 1820 0 0 # Architect charge overlay wait 8 playfram 0x220 @@ -13157,8 +13327,8 @@ OptectonWalkingToIdle: goto SkryrokorLocal00 OptectonWarpIn: - imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2153 0 0 # Optecton Warp Flash (cm\protoss\optecton.grp) + goto OptectonWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13328,8 +13498,8 @@ PatriarchWalkingToIdle: goto PatriarchLocal00 PatriarchWarpIn: - imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2154 0 0 # Patriarch Warp Flash (cm\protoss\patriarch.grp) + goto PatriarchWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13370,7 +13540,7 @@ Engines_MultiGlowHeader_OmniInit: # 1731 Analogue (cm\protoss\analogue.grp) .headerstart IsId 741 -Type 12 +Type 21 Init AnalogueInit Death AnalogueDeath GndAttkInit AnalogueGndAttkInit @@ -13385,6 +13555,14 @@ Unused2 [NONE] Walking AnalogueWalking WalkingToIdle AnalogueGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn AnalogueWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -13446,6 +13624,10 @@ AnalogueWalking: playfram 0x00 wait 1 goto AnalogueWalking + +AnalogueWarpIn: + imgol 2155 0 0 # Analogue Warp Flash (cm\protoss\analogue.grp) + goto AnalogueGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13615,8 +13797,8 @@ PotentateMeleeAttkRpt: goto InfestedTerranWalkingToIdle PotentateWarpIn: - imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto SkryrokorLocal00 + imgol 2144 0 0 # Potentate Warp Flash (cm\protoss\potentate.grp) + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13645,7 +13827,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LegionnaireWarpIn +WarpIn AdherentWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -13671,6 +13853,10 @@ AdherentGndAttkInit: gotorepeatattk ignorerest goto LegionnaireGndAttkToIdle + +AdherentWarpIn: + imgol 2149 0 0 # Adherent Warp Flash (cm\faction-p\adherent.grp) + goto GolemWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14454,7 +14640,7 @@ AvengeProcDeath: # 1946 Vibrance (cm\protoss\vibrance.grp) .headerstart IsId 798 -Type 12 +Type 21 Init VibranceInit Death AnalogueDeath GndAttkInit VibranceGndAttkInit @@ -14469,6 +14655,14 @@ Unused2 [NONE] Walking SkryrokorLocal00 WalkingToIdle VibranceGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn VibranceWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -14483,6 +14677,10 @@ VibranceGndAttkInit: attack gotorepeatattk goto VibranceGndAttkToIdle + +VibranceWarpIn: + imgol 2148 0 0 # Vibrance Warp Flash (cm\protoss\vibrance.grp) + goto VibranceGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14511,7 +14709,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LegionnaireWarpIn +WarpIn CicatusWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -14543,13 +14741,17 @@ CicatusGndAttkToIdle: playfram 0x100 wait 1 goto GolemWalkingToIdle + +CicatusWarpIn: + imgol 2165 0 0 # Cicatus Warp Flash (cm\faction-p\cicatus.grp) + goto GolemWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1978 Oscilliant (cm\protoss\oscilliant.grp) .headerstart IsId 806 -Type 12 +Type 21 Init OscilliantInit Death AtreusDeath GndAttkInit OscilliantGndAttkInit @@ -14564,6 +14766,14 @@ Unused2 [NONE] Walking OscilliantWalking WalkingToIdle OscilliantGndAttkToIdle SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn OscilliantWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -14640,6 +14850,10 @@ OscilliantWalking: playfram 0xcc goto OscilliantWalking +OscilliantWarpIn: + imgol 2125 0 0 # Oscilliant Warp Flash (cm\protoss\oscilliant.grp) + goto OscilliantGndAttkToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1981 Renesair (cm\faction-p\renesair.grp) @@ -14667,7 +14881,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn RenesairWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -14688,6 +14902,10 @@ RenesairWalking: playfram 0x00 imgol 1983 0 0 # Renesair Engines (cm\faction-p\renesair-engine.grp) goto SkryrokorLocal00 + +RenesairWarpIn: + imgol 2163 0 0 # Renesair Warp Flash (cm\faction-p\renesair.grp) + goto VassalWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14716,7 +14934,7 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn LanifectWarpIn +WarpIn UnarWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -14773,6 +14991,10 @@ UnarWalking: setvertpos 0 goto SkryrokorLocal00 +UnarWarpIn: + imgol 2146 0 0 # Unar Warp Flash (cm\protoss\unar.grp) + goto ArchitectWalkingToIdle + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1991 Xenolith (cm\protoss\xenolith.grp) @@ -14846,8 +15068,9 @@ Death Generic_Wait1End ShadowHeaderInit: wait 1 +WarpFlashHeaderInit: followmaingraphic - goto ShadowHeaderInit + goto ShadowHeaderInit # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -15085,7 +15308,7 @@ GndAttkToIdle SkryrokorLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking AutocortWalking -WalkingToIdle SkryrokorLocal00 +WalkingToIdle DidactGndAttkToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt AutocortAlmostBuilt @@ -15101,7 +15324,7 @@ WarpIn AutocortWarpIn AutocortInit: imgul 2058 0 7 # Autocort Shadow (cm\protoss\autocort.grp) playfram 0x00 - goto SkryrokorLocal00 + goto DidactGndAttkToIdle AutocortDeath: setfldirect 0 @@ -15167,5 +15390,222 @@ AutocortAlmostBuilt: goto AutocortAlmostBuilt AutocortWarpIn: - imgol 139 0 0 # Autocort Warp Flash (protoss\probe.grp) - goto SkryrokorLocal00 + imgol 2121 0 0 # Autocort Warp Flash (cm\protoss\autocort.grp) + goto DidactGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2028 Manifold (Starbound) (cm\faction-p\manifold-starbound.grp) +.headerstart +IsId 732 +Type 21 +Init ManifoldStarboundInit +Death ManifoldStarboundDeath +GndAttkInit ManifoldStarboundGndAttkInit +AirAttkInit ManifoldStarboundGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ManifoldStarboundGndAttkInit +AirAttkRpt ManifoldStarboundGndAttkInit +CastSpell [NONE] +GndAttkToIdle ManifoldStarboundGndAttkToIdle +AirAttkToIdle ManifoldStarboundGndAttkToIdle +Unused2 [NONE] +Walking ManifoldStarboundWalking +WalkingToIdle ManifoldStarboundWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ManifoldStarboundWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +ManifoldStarboundInit: + imgul 2029 0 -1 # Manifold (Starbound) Shadow (cm\faction-p\manifold-starbound-shadow.grp) + playfram 0x00 + wait 1 + goto DidactGndAttkToIdle + +ManifoldStarboundGndAttkToIdle: + playfram 0x00 + wait 1 + goto DidactGndAttkToIdle + +ManifoldStarboundDeath: + playsndbtwn 3138 3140 # Manifold (Starbound) death 01, 02, 03 + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 945 0 0 # Manifold (Starbound) remains (cm\protoss\manifold-death.grp) + wait 1 + end + +ManifoldStarboundGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x20 + attackwith 1 + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + ignorerest + goto ManifoldStarboundGndAttkToIdle + +ManifoldStarboundWalking: + playfram 0x00 + goto ManifoldStarboundGndAttkToIdle + +ManifoldStarboundWalkingToIdle: + playfram 0x00 + goto ManifoldStarboundGndAttkToIdle + +ManifoldStarboundWarpIn: + imgol 2167 0 0 # Manifold (Starbound) Warp Flash (cm\faction-p\manifold-starbound.grp) + goto ManifoldStarboundWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1988 Ashguard (cm\faction-p\ashguard.grp) +.headerstart +IsId 733 +Type 21 +Init AshguardInit +Death AshguardDeath +GndAttkInit AshguardGndAttkInit +AirAttkInit AshguardGndAttkInit +Unused1 AshguardUnused1 +GndAttkRpt AshguardGndAttkRpt +AirAttkRpt AshguardGndAttkRpt +CastSpell [NONE] +GndAttkToIdle AshguardGndAttkToIdle +AirAttkToIdle AshguardGndAttkToIdle +Unused2 [NONE] +Walking AshguardWalking +WalkingToIdle AshguardWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn AshguardWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +AshguardInit: + imgul 1989 0 0 # Ashguard Shadow (cm\faction-p\ashguard-shadow.grp) +AshguardWalkingToIdle: + playfram 0x00 + wait 1 + goto DracadinLocal00 + +AshguardDeath: + playsnd 1335 # Ashguard death 01 + imgol 1774 0 0 # Dracadin death explosion (cm\protoss\dracadin-explosion.grp) + imgol 153 0 0 # Zealot Death (protoss\zealot.grp) + setfldirect 0 + playfram 832 + wait 2 + playfram 833 + wait 2 + playfram 834 + wait 2 + playfram 835 + wait 2 + playfram 836 + wait 2 + lowsprul 925 0 0 # Ashguard remains + wait 1 + end + +AshguardUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1704 # Ashguard Revive 01 + sprol 746 0 0 # Zealot Death Reversed (protoss\zealot.grp) + wait 2 + playfram 773 + wait 2 + playfram 772 + wait 2 + playfram 771 + wait 2 + playfram 770 + wait 2 + playfram 769 + wait 2 + playfram 768 + wait 2 + setfldirect 12 + nobrkcodeend + goto AshguardWalkingToIdle + +AshguardGndAttkInit: + playfram 0x220 + wait 1 + playfram 0x260 + wait 1 + playfram 0x280 + wait 1 +AshguardGndAttkRpt: + playfram 0x2A0 + wait 1 + playfram 0x2C0 + wait 1 + attackwith 1 + playfram 0x2E0 + wait 1 + playfram 0x2C0 + gotorepeatattk + ignorerest +AshguardGndAttkToIdle: + wait 1 + playfram 0x2A0 + wait 1 + playfram 0x280 + wait 1 + playfram 0x260 + wait 1 + playfram 0x240 + wait 1 + playfram 0x220 + goto AshguardWalkingToIdle + +AshguardWalking: + move 6 + wait 1 + playfram 0x100 + move 6 + wait 1 + playfram 0x120 + move 6 + wait 1 + playfram 0x140 + move 6 + wait 1 + playfram 0x160 + move 6 + wait 1 + playfram 0x180 + move 6 + wait 1 + playfram 0x1A0 + move 6 + wait 1 + playfram 0x1C0 + move 6 + wait 1 + playfram 0x1E0 + goto AshguardWalking + +AshguardWarpIn: + imgol 2161 0 0 # Ashguard Warp Flash (cm\faction-p\ashguard.grp) + goto AshguardWalkingToIdle diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index ad6f0fd4..edf49be2 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 a7081f80..c54dca0b 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -520,8 +520,8 @@ EidolonGndAttkInit: wait 1 playfram 0x11 wait 1 + sigorder 32 playfram 0x22 - playsndbtwn 3602 3604 # Eidolon windup 01, 02, 03 wait 12 EidolonGndAttkRpt: wait 1 @@ -691,11 +691,11 @@ IsId 75 Type 12 Init Goliath_Base_Init Death Goliath_Base_Death -GndAttkInit [NONE] -AirAttkInit [NONE] +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 Unused1 Goliath_Base_Unused1 -GndAttkRpt [NONE] -AirAttkRpt [NONE] +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] @@ -796,8 +796,9 @@ Goliath_Turret_Init: goto SkryrokorLocal00 Goliath_Turret_GndAttkInit: - playsndbtwn 3201 3203 # Goliath windup 01, 02, 03 - wait 5 + wait 1 + sigorder 32 + wait 4 Goliath_Turret_GndAttkRpt: wait 1 nobrkcodestart @@ -7417,7 +7418,7 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking [NONE] +Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 MadrigalFuriaBaseSpecialState2 @@ -7479,7 +7480,7 @@ CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] -Walking [NONE] +Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 SkryrokorLocal00 SpecialState2 MadrigalFuriaTurretSpecialState2 @@ -12005,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 @@ -12026,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 @@ -12049,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: @@ -15720,9 +15721,11 @@ CyprianDeath: CyprianGndAttkInit: playfram 0x120 wait 1 + sigorder 32 playfram 0x140 wait 1 playfram 0x160 + wait 6 CyprianGndAttkRpt: wait 1 nobrkcodestart diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 301d6661..2bb04d2d 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 3bb777d2..17d7b850 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -1591,26 +1591,40 @@ InfestedKerriganUnBurrow: # 036 Larva (zerg\larva.grp) .headerstart IsId 21 -Type 12 +Type 26 Init LarvaInit Death LarvaDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 +Unused1 SkryrokorLocal00 +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 +CastSpell SkryrokorLocal00 +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 SkryrokorLocal00 Walking LarvaWalking WalkingToIdle LarvaInit -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 +SpecialState2 SkryrokorLocal00 +AlmostBuilt SkryrokorLocal00 +Built SkryrokorLocal00 +Landing SkryrokorLocal00 +LiftOff SkryrokorLocal00 +IsWorking SkryrokorLocal00 +WorkingToIdle SkryrokorLocal00 +WarpIn SkryrokorLocal00 +Unused3 SkryrokorLocal00 +StarEditInit SkryrokorLocal00 +Disable SkryrokorLocal00 +Burrow SkryrokorLocal00 +UnBurrow SkryrokorLocal00 +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # LarvaInit: - playfram 0x00 # Frame set 0 + playfram 0x00 goto SkryrokorLocal00 LarvaDeath: @@ -6346,7 +6360,7 @@ GorgrokorWalkingToIdle: goto GorgrokorWalkingToIdle GorgrokorDeath: - playsnd 852 # Zerg\Guardian\ZGuDth00.WAV + playsndbtwn 3651 3652 # Geszithalor death 01, 02 imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) wait 1 lowsprul 963 0 42 # Zerg Building Rubble Small @@ -16679,4 +16693,641 @@ AgrilethUnBurrow: wait 1 sigorder 4 goto AgrilethGndAttkToIdle - \ No newline at end of file + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2141 Kethrostalor (cm\zerg\kethrostalor.grp) +.headerstart +IsId 832 +Type 26 +Init KethrostalorInit +Death KethrostalorDeath +GndAttkInit KethrostalorGndAttkInit +AirAttkInit KethrostalorGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt KethrostalorGndAttkRpt +AirAttkRpt KethrostalorGndAttkRpt +CastSpell [NONE] +GndAttkToIdle KethrostalorGndAttkToIdle +AirAttkToIdle KethrostalorGndAttkToIdle +Unused2 [NONE] +Walking KethrostalorWalking +WalkingToIdle KethrostalorGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 KethrostalorSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow KethrostalorBurrow +UnBurrow KethrostalorUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +KethrostalorInit: + imgul 2142 0 0 # Kethrostalor Shadow (cm\zerg\kethrostalor-shadow.grp) +KethrostalorGndAttkToIdle: + playfram 0x00 + goto KethrostalorLocal00 + +KethrostalorLocal00: + wait 62 + randcondjmp 25 KethrostalorLocal02 + randcondjmp 85 KethrostalorLocal01 + goto KethrostalorLocal00 + +KethrostalorLocal01: + playfram 0x88 + wait 1 + playfram 0x99 + wait 1 + playfram 0xaa + wait 1 + playfram 0xbb + wait 25 + playfram 0xaa + wait 1 + playfram 0x99 + wait 1 + randcondjmp 25 KethrostalorLocal03 + goto KethrostalorGndAttkToIdle + +KethrostalorLocal02: + playfram 0x00 + wait 1 + turnccwise 1 + playfram 0x11 + wait 1 + turnccwise 1 + playfram 0x22 + wait 1 + turnccwise 1 + playfram 0x11 + wait 1 + turnccwise 1 + playfram 0x00 + wait 1 + turnccwise 1 + playfram 0x88 + wait 1 + turnccwise 1 + goto KethrostalorGndAttkToIdle + +KethrostalorLocal03: + playfram 0x88 + wait 1 + turncwise 1 + playfram 0x00 + wait 1 + turncwise 1 + playfram 0x11 + wait 1 + turncwise 1 + playfram 0x22 + wait 1 + turncwise 1 + playfram 0x11 + wait 1 + turncwise 1 + playfram 0x00 + wait 1 + turncwise 1 + goto KethrostalorGndAttkToIdle + +KethrostalorDeath: + playsnd 878 # Zerg\Ultra\ZUlDth00.WAV + imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) + wait 2 + lowsprul 186 0 0 # Zerg Building Rubble Small + wait 1 + end + +KethrostalorGndAttkInit: + playfram 0x11 +KethrostalorGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x22 + attackwith 1 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 4 + playfram 0x66 + attackwith 1 + wait 1 + playfram 0x55 + wait 1 + playfram 0x44 + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + wait 4 + playfram 0x33 + attackwith 1 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + playfram 0x55 + wait 1 + playfram 0x44 + wait 4 + playfram 0x33 + attackwith 1 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 4 + playfram 0x55 + attackwith 1 + wait 1 + playfram 0x66 + wait 1 + playfram 0x77 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto KethrostalorGndAttkToIdle + +KethrostalorWalking: + playfram 0x99 + move 3 + wait 1 + playfram 0xaa + move 3 + wait 1 + playfram 0xbb + move 3 + wait 1 + playfram 0xcc + move 3 + wait 1 + playfram 0xee + move 3 + wait 1 + playfram 0xff + move 3 + wait 1 + playfram 0x110 + move 3 + wait 1 + playfram 0x121 + move 3 + wait 1 + playfram 0x132 + move 3 + wait 1 + playfram 0x143 + move 3 + wait 1 + playfram 0x154 + move 3 + wait 1 + goto KethrostalorWalking + +KethrostalorSpecialState2: + playfram 0x165 + goto SkryrokorLocal00 + +KethrostalorBurrow: + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + playfram 0x165 + wait 1 + sigorder 4 + goto SkryrokorLocal00 + +KethrostalorUnBurrow: + wait 1 + waitrand 1 2 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x66 + wait 1 + playfram 0x55 + wait 1 + playfram 0x44 + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + wait 1 + playfram 0x11 + wait 1 + sigorder 4 + goto KethrostalorGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1180 Kethraj Keep (cm\zerg\kethraj-keep.grp) +.headerstart +IsId 833 +Type 20 +Init KethrajKeepInit +Death KethrajKeepDeath +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 KethrajKeepAlmostBuilt +Built KethrajKeepBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking KethrajKeepIsWorking +WorkingToIdle KethrajKeepWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +KethrajKeepInit: + imgul 1181 0 0 # Kethraj Keep Shadow (cm\zerg\kethraj-keep-shadow.grp) + playfram 0x00 + goto KethrajKeepWorkingToIdle + +KethrajKeepWorkingToIdle: + 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 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + goto KethrajKeepWorkingToIdle + +KethrajKeepDeath: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) + wait 1 + end + +KethrajKeepAlmostBuilt: + imgol 107 0 0 # Zerg Building Spawn (Small) (zerg\zSpawn01.grp) +KethrajKeepBuilt: + playfram 0x00 + wait 2 + goto KethrajKeepWorkingToIdle + +KethrajKeepIsWorking: + playfram 0x00 + wait 1 + playfram 1 + waitrand 1 2 + playfram 2 + wait 1 + playfram 3 + waitrand 1 2 + playfram 4 + wait 1 + playfram 5 + waitrand 1 2 + playfram 6 + wait 1 + playfram 7 + waitrand 1 2 + playfram 8 + wait 1 + playfram 9 + waitrand 1 2 + playfram 10 + wait 1 + goto KethrajKeepIsWorking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1800 Iziralisk (cm\faction-z\iziralisk.grp) +.headerstart +IsId 834 +Type 26 +Init IziraliskInit +Death IziraliskDeath +GndAttkInit IziraliskGndAttkInit +AirAttkInit IziraliskGndAttkInit +Unused1 IziraliskUnused1 +GndAttkRpt IziraliskGndAttkRpt +AirAttkRpt IziraliskGndAttkRpt +CastSpell [NONE] +GndAttkToIdle IziraliskGndAttkToIdle +AirAttkToIdle IziraliskGndAttkToIdle +Unused2 [NONE] +Walking IziraliskWalking +WalkingToIdle IziraliskGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 IziraliskSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow IziraliskBurrow +UnBurrow IziraliskUnburrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +IziraliskInit: + imgul 1473 0 0 # Iziralisk Shadow (cm\zerg\izirokor-shad.grp) +IziraliskGndAttkToIdle: + playfram 0x00 + goto IziraliskLocal00 + +IziraliskLocal00: + wait 62 + randcondjmp 128 IziraliskLocal01 + goto IziraliskLocal00 + +IziraliskLocal01: + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + randcondjmp 34 IziraliskLocal02 + playfram 0x55 + wait 1 + playfram 0x44 + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + wait 1 + playfram 0x11 + wait 1 + goto IziraliskGndAttkToIdle + +IziraliskLocal02: + randcondjmp 62 IziraliskLocal03 + randcondjmp 51 IziraliskLocal04 + playfram 0x77 + wait 1 + playfram 0x88 + wait 1 + playfram 0x99 + wait 1 + playfram 0xaa + wait 1 + playfram 0xbb + wait 1 + playfram 0xcc + wait 1 + goto IziraliskGndAttkToIdle + +IziraliskLocal03: + playfram 0x55 + wait 1 + turnccwise 1 + playfram 0x44 + wait 1 + turnccwise 1 + playfram 0x33 + wait 1 + turnccwise 1 + playfram 0x22 + wait 1 + turnccwise 1 + playfram 0x11 + wait 1 + turnccwise 1 + goto IziraliskGndAttkToIdle + +IziraliskLocal04: + playfram 0x55 + wait 1 + turncwise 1 + playfram 0x44 + wait 1 + turncwise 1 + playfram 0x33 + wait 1 + turncwise 1 + playfram 0x22 + wait 1 + turncwise 1 + playfram 0x11 + wait 1 + turncwise 1 + goto IziraliskGndAttkToIdle + +IziraliskDeath: + playsnd 1506 # Iziralisk death 01 + imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) + wait 5 + lowsprul 763 0 0 # Iziralisk Remnants (cm\zerg\izirokor-corpse.grp) + wait 2 + end + +IziraliskUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1181 + playfram 639 + wait 2 + playfram 638 + wait 2 + playfram 637 + wait 2 + playfram 636 + wait 2 + playfram 635 + wait 2 + playfram 634 + wait 2 + playfram 633 + wait 2 + playfram 632 + wait 2 + playfram 631 + wait 2 + playfram 630 + wait 2 + setfldirect 14 + nobrkcodeend + goto IziraliskGndAttkToIdle + +IziraliskGndAttkInit: + playfram 0x1ba + wait 1 + playfram 0x1dc +IziraliskGndAttkRpt: + nobrkcodestart + playsndbtwn 1880 1881 # Iziralisk weapon fire 01, 02 + wait 1 + wait 1 + playfram 0x1fe + wait 1 + playfram 0x20f + attack + wait 2 + playfram 0x220 + wait 2 + playfram 0x231 + wait 1 + playfram 0x242 + wait 2 + playfram 0x253 + wait 1 + playfram 0x264 + wait 1 + nobrkcodeend + gotorepeatattk + goto IziraliskGndAttkToIdle + +IziraliskWalking: + move 5 + wait 1 + playfram 0x110 + move 5 + wait 1 + playfram 0x121 + move 5 + wait 1 + playfram 0x132 + move 5 + wait 1 + playfram 0x143 + move 5 + wait 1 + playfram 0x154 + move 5 + wait 1 + playfram 0x165 + move 5 + wait 1 + playfram 0x176 + move 5 + wait 1 + playfram 0x187 + move 5 + wait 1 + playfram 0x198 + move 5 + wait 1 + playfram 0x1a9 + move 5 + wait 1 + playfram 0xdd + move 5 + wait 1 + playfram 0xee + move 5 + wait 1 + playfram 0xff + goto IziraliskWalking + +IziraliskSpecialState2: + playfram 0x187 + goto SkryrokorLocal00 + +IziraliskBurrow: + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x286 + wait 1 + playfram 0x297 + wait 1 + playfram 0x2a8 + wait 1 + playfram 0x2b9 + wait 1 + playfram 0x2ca + imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x2db + wait 1 + playfram 0x2ec + wait 1 + sigorder 4 + playfram 0x2fd + goto SkryrokorLocal00 + +IziraliskUnburrow: + wait 1 + waitrand 1 2 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x2ec + wait 1 + playfram 0x2db + wait 1 + playfram 0x2ca + wait 1 + playfram 0x2b9 + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x2a8 + wait 1 + playfram 0x297 + wait 1 + sigorder 4 + setfldirect 14 + goto IziraliskGndAttkToIdle \ No newline at end of file diff --git a/mpq/sound/cm/a/scrap-01.wav b/mpq/sound/cm/a/scrap-01.wav new file mode 100644 index 00000000..bb81475f Binary files /dev/null and b/mpq/sound/cm/a/scrap-01.wav differ diff --git a/mpq/sound/cm/a/scrap-02.wav b/mpq/sound/cm/a/scrap-02.wav new file mode 100644 index 00000000..1e54dd13 Binary files /dev/null and b/mpq/sound/cm/a/scrap-02.wav differ diff --git a/mpq/sound/cm/a/scrap-03.wav b/mpq/sound/cm/a/scrap-03.wav new file mode 100644 index 00000000..004591ec Binary files /dev/null and b/mpq/sound/cm/a/scrap-03.wav differ 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/embassy/amb-01.wav b/mpq/sound/cm/p/_building/embassy/amb-01.wav index 515c4e1d..5daf0834 100644 Binary files a/mpq/sound/cm/p/_building/embassy/amb-01.wav and b/mpq/sound/cm/p/_building/embassy/amb-01.wav differ 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 be34ed8f..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/p-unit-deploy-01.wav b/mpq/sound/cm/p/_building/p-unit-deploy-01.wav new file mode 100644 index 00000000..d09cf996 Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-01.wav differ diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-02.wav b/mpq/sound/cm/p/_building/p-unit-deploy-02.wav new file mode 100644 index 00000000..4602dbbb Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-02.wav differ diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-03.wav b/mpq/sound/cm/p/_building/p-unit-deploy-03.wav new file mode 100644 index 00000000..8730e472 Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-03.wav differ diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-04.wav b/mpq/sound/cm/p/_building/p-unit-deploy-04.wav new file mode 100644 index 00000000..fefad74c Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-04.wav differ 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/p/optecton/windup-01.wav b/mpq/sound/cm/p/optecton/windup-01.wav new file mode 100644 index 00000000..1966e7d5 Binary files /dev/null and b/mpq/sound/cm/p/optecton/windup-01.wav differ diff --git a/mpq/sound/cm/p/optecton/windup-02.wav b/mpq/sound/cm/p/optecton/windup-02.wav new file mode 100644 index 00000000..d333a99e Binary files /dev/null and b/mpq/sound/cm/p/optecton/windup-02.wav differ diff --git a/mpq/sound/cm/p/optecton/windup-03.wav b/mpq/sound/cm/p/optecton/windup-03.wav new file mode 100644 index 00000000..740e8da6 Binary files /dev/null and b/mpq/sound/cm/p/optecton/windup-03.wav differ diff --git a/mpq/sound/cm/t/_building/ministry/amb-01.wav b/mpq/sound/cm/t/_building/ministry/amb-01.wav index 7eaed639..e2765be8 100644 Binary files a/mpq/sound/cm/t/_building/ministry/amb-01.wav and b/mpq/sound/cm/t/_building/ministry/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/t-unit-deploy-01.wav b/mpq/sound/cm/t/_building/t-unit-deploy-01.wav new file mode 100644 index 00000000..62c7c873 Binary files /dev/null and b/mpq/sound/cm/t/_building/t-unit-deploy-01.wav differ diff --git a/mpq/sound/cm/t/cyprian/windup-01.wav b/mpq/sound/cm/t/cyprian/windup-01.wav new file mode 100644 index 00000000..4e92498e Binary files /dev/null and b/mpq/sound/cm/t/cyprian/windup-01.wav differ diff --git a/mpq/sound/cm/t/cyprian/windup-02.wav b/mpq/sound/cm/t/cyprian/windup-02.wav new file mode 100644 index 00000000..36b8b84c Binary files /dev/null and b/mpq/sound/cm/t/cyprian/windup-02.wav differ diff --git a/mpq/sound/cm/t/cyprian/windup-03.wav b/mpq/sound/cm/t/cyprian/windup-03.wav new file mode 100644 index 00000000..e08819fd Binary files /dev/null and b/mpq/sound/cm/t/cyprian/windup-03.wav differ diff --git a/mpq/sound/cm/z/_building/kethraj-keep.wav b/mpq/sound/cm/z/_building/kethraj-keep.wav new file mode 100644 index 00000000..c75cfeea Binary files /dev/null and b/mpq/sound/cm/z/_building/kethraj-keep.wav differ diff --git a/mpq/sound/cm/z/gorgrokor/dth-01.wav b/mpq/sound/cm/z/gorgrokor/dth-01.wav new file mode 100644 index 00000000..9e5b0078 Binary files /dev/null and b/mpq/sound/cm/z/gorgrokor/dth-01.wav differ diff --git a/mpq/sound/cm/z/gorgrokor/dth-02.wav b/mpq/sound/cm/z/gorgrokor/dth-02.wav new file mode 100644 index 00000000..4a06d755 Binary files /dev/null and b/mpq/sound/cm/z/gorgrokor/dth-02.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wf-01.wav b/mpq/sound/cm/z/kethrostalor/wf-01.wav new file mode 100644 index 00000000..0b92db42 Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wf-01.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wf-02.wav b/mpq/sound/cm/z/kethrostalor/wf-02.wav new file mode 100644 index 00000000..1885ffe9 Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wf-02.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wf-03.wav b/mpq/sound/cm/z/kethrostalor/wf-03.wav new file mode 100644 index 00000000..a77b1b30 Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wf-03.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wh-01.wav b/mpq/sound/cm/z/kethrostalor/wh-01.wav new file mode 100644 index 00000000..5ddff61e Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wh-01.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wh-02.wav b/mpq/sound/cm/z/kethrostalor/wh-02.wav new file mode 100644 index 00000000..ddc51ff3 Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wh-02.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wh-03.wav b/mpq/sound/cm/z/kethrostalor/wh-03.wav new file mode 100644 index 00000000..c5e348fc Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wh-03.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wh-04.wav b/mpq/sound/cm/z/kethrostalor/wh-04.wav new file mode 100644 index 00000000..2c5839fb Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wh-04.wav differ diff --git a/mpq/sound/cm/z/kethrostalor/wh-05.wav b/mpq/sound/cm/z/kethrostalor/wh-05.wav new file mode 100644 index 00000000..9a84b8b9 Binary files /dev/null and b/mpq/sound/cm/z/kethrostalor/wh-05.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/sound/cm/z/ultrokor/eat-01.wav b/mpq/sound/cm/z/ultrokor/eat-01.wav new file mode 100644 index 00000000..4eff55cf Binary files /dev/null and b/mpq/sound/cm/z/ultrokor/eat-01.wav differ diff --git a/mpq/sound/cm/z/ultrokor/eat-02.wav b/mpq/sound/cm/z/ultrokor/eat-02.wav new file mode 100644 index 00000000..d5900389 Binary files /dev/null and b/mpq/sound/cm/z/ultrokor/eat-02.wav differ diff --git a/mpq/sound/cm/z/ultrokor/eat-03.wav b/mpq/sound/cm/z/ultrokor/eat-03.wav new file mode 100644 index 00000000..e935485b Binary files /dev/null and b/mpq/sound/cm/z/ultrokor/eat-03.wav differ diff --git a/mpq/tileset/Jungle.cv5 b/mpq/tileset/Jungle.cv5 index f6fbccb7..bdea53db 100644 Binary files a/mpq/tileset/Jungle.cv5 and b/mpq/tileset/Jungle.cv5 differ diff --git a/mpq/tileset/Jungle.vf4 b/mpq/tileset/Jungle.vf4 index 08d972d4..5eda01fe 100644 Binary files a/mpq/tileset/Jungle.vf4 and b/mpq/tileset/Jungle.vf4 differ diff --git a/mpq/tileset/Jungle.vr4 b/mpq/tileset/Jungle.vr4 index 1cdb051f..15d30422 100644 Binary files a/mpq/tileset/Jungle.vr4 and b/mpq/tileset/Jungle.vr4 differ diff --git a/mpq/tileset/Jungle.vx4ex b/mpq/tileset/Jungle.vx4ex index f32ca284..c720b522 100644 Binary files a/mpq/tileset/Jungle.vx4ex and b/mpq/tileset/Jungle.vx4ex differ diff --git a/mpq/tileset/ice.cv5 b/mpq/tileset/ice.cv5 index f2a1680f..991719f3 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 0a249005..0537375c 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 0d78bbb5..54e5684d 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 524f4688..96d5c02c 100644 Binary files a/mpq/tileset/ice.vx4ex and b/mpq/tileset/ice.vx4ex differ diff --git a/mpq/unit/cm/askosi/bounty-shadow.grp b/mpq/unit/cm/askosi/bounty-shadow.grp new file mode 100644 index 00000000..6d24e7b3 Binary files /dev/null and b/mpq/unit/cm/askosi/bounty-shadow.grp differ diff --git a/mpq/unit/cm/askosi/bounty.grp b/mpq/unit/cm/askosi/bounty.grp new file mode 100644 index 00000000..1cadd1ce Binary files /dev/null and b/mpq/unit/cm/askosi/bounty.grp differ diff --git a/mpq/unit/cm/askosi/cipher-shadow.grp b/mpq/unit/cm/askosi/cipher-shadow.grp new file mode 100644 index 00000000..f7558aef Binary files /dev/null and b/mpq/unit/cm/askosi/cipher-shadow.grp differ diff --git a/mpq/unit/cm/askosi/cipher.grp b/mpq/unit/cm/askosi/cipher.grp new file mode 100644 index 00000000..4cd9e6ca Binary files /dev/null and b/mpq/unit/cm/askosi/cipher.grp differ diff --git a/mpq/unit/cm/askosi/cosmoscope-shadow.grp b/mpq/unit/cm/askosi/cosmoscope-shadow.grp new file mode 100644 index 00000000..918e1f28 Binary files /dev/null and b/mpq/unit/cm/askosi/cosmoscope-shadow.grp differ diff --git a/mpq/unit/cm/askosi/cosmoscope.grp b/mpq/unit/cm/askosi/cosmoscope.grp new file mode 100644 index 00000000..8c4f6015 Binary files /dev/null and b/mpq/unit/cm/askosi/cosmoscope.grp differ diff --git a/mpq/unit/cm/askosi/crematorium.grp b/mpq/unit/cm/askosi/crematorium.grp new file mode 100644 index 00000000..32929d51 Binary files /dev/null and b/mpq/unit/cm/askosi/crematorium.grp differ diff --git a/mpq/unit/cm/askosi/dyad.grp b/mpq/unit/cm/askosi/dyad.grp new file mode 100644 index 00000000..7ec628d9 Binary files /dev/null and b/mpq/unit/cm/askosi/dyad.grp differ diff --git a/mpq/unit/cm/askosi/gauntlet-shadow.grp b/mpq/unit/cm/askosi/gauntlet-shadow.grp new file mode 100644 index 00000000..cc0b9010 Binary files /dev/null and b/mpq/unit/cm/askosi/gauntlet-shadow.grp differ diff --git a/mpq/unit/cm/askosi/gauntlet.grp b/mpq/unit/cm/askosi/gauntlet.grp new file mode 100644 index 00000000..90c4be45 Binary files /dev/null and b/mpq/unit/cm/askosi/gauntlet.grp differ diff --git a/mpq/unit/cm/askosi/helion.grp b/mpq/unit/cm/askosi/helion.grp new file mode 100644 index 00000000..512cb7de Binary files /dev/null and b/mpq/unit/cm/askosi/helion.grp differ diff --git a/mpq/unit/cm/askosi/missionary.grp b/mpq/unit/cm/askosi/missionary.grp index 5116c5da..4361ce32 100644 Binary files a/mpq/unit/cm/askosi/missionary.grp and b/mpq/unit/cm/askosi/missionary.grp differ diff --git a/mpq/unit/cm/askosi/pilgrim.grp b/mpq/unit/cm/askosi/pilgrim.grp index c1f00059..bf5e8b79 100644 Binary files a/mpq/unit/cm/askosi/pilgrim.grp and b/mpq/unit/cm/askosi/pilgrim.grp differ diff --git a/mpq/unit/cm/askosi/scepter.grp b/mpq/unit/cm/askosi/scepter.grp new file mode 100644 index 00000000..00717c98 Binary files /dev/null and b/mpq/unit/cm/askosi/scepter.grp differ diff --git a/mpq/unit/cm/askosi/tirade.grp b/mpq/unit/cm/askosi/tirade.grp new file mode 100644 index 00000000..f31d5927 Binary files /dev/null and b/mpq/unit/cm/askosi/tirade.grp 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/mpq/unit/cm/faction-z/azanthrokor.grp b/mpq/unit/cm/faction-z/azanthrokor.grp new file mode 100644 index 00000000..feea8c58 Binary files /dev/null and b/mpq/unit/cm/faction-z/azanthrokor.grp differ diff --git a/mpq/unit/cm/protoss/autocort-shadow.grp b/mpq/unit/cm/protoss/autocort-shadow.grp new file mode 100644 index 00000000..2485e537 Binary files /dev/null and b/mpq/unit/cm/protoss/autocort-shadow.grp differ diff --git a/mpq/unit/cm/protoss/autocort.grp b/mpq/unit/cm/protoss/autocort.grp index 598dfc2d..99782660 100644 Binary files a/mpq/unit/cm/protoss/autocort.grp and b/mpq/unit/cm/protoss/autocort.grp differ diff --git a/mpq/unit/cm/zerg/kethraj-keep-damage.lof b/mpq/unit/cm/zerg/kethraj-keep-damage.lof new file mode 100644 index 00000000..e9258e50 Binary files /dev/null and b/mpq/unit/cm/zerg/kethraj-keep-damage.lof differ diff --git a/mpq/unit/cm/zerg/kethraj-keep-shadow.grp b/mpq/unit/cm/zerg/kethraj-keep-shadow.grp new file mode 100644 index 00000000..d98917ce Binary files /dev/null and b/mpq/unit/cm/zerg/kethraj-keep-shadow.grp differ diff --git a/mpq/unit/cm/zerg/kethraj-keep.grp b/mpq/unit/cm/zerg/kethraj-keep.grp new file mode 100644 index 00000000..d62a1e99 Binary files /dev/null and b/mpq/unit/cm/zerg/kethraj-keep.grp differ diff --git a/mpq/unit/cm/zerg/kethrostalor-attack.lol b/mpq/unit/cm/zerg/kethrostalor-attack.lol new file mode 100644 index 00000000..3c93c6c5 Binary files /dev/null and b/mpq/unit/cm/zerg/kethrostalor-attack.lol differ diff --git a/mpq/unit/cm/zerg/kethrostalor-shadow.grp b/mpq/unit/cm/zerg/kethrostalor-shadow.grp index e09ea934..49719753 100644 Binary files a/mpq/unit/cm/zerg/kethrostalor-shadow.grp and b/mpq/unit/cm/zerg/kethrostalor-shadow.grp differ diff --git a/mpq/unit/cm/zerg/kethrostalor.grp b/mpq/unit/cm/zerg/kethrostalor.grp index e09ea934..0c4a2c1c 100644 Binary files a/mpq/unit/cm/zerg/kethrostalor.grp and b/mpq/unit/cm/zerg/kethrostalor.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 90535fd4..0a1785f7 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 e13caeae..eb4de06b 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 a50529f4..3a48cc42 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 3d3f5639..25a9c0f7 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 112b4299..c591c888 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,109 +1,84 @@ -# 24 August 2025 -## Year 3, month 8, patch 2 +# 29 September 2025 +## Year 3, month 9, patch 2 ## Patch goals -- Continue post-change balancing for all races -- Implement advanced constructors for all races +- Implement the Kethrostalor +- Continue balancing for all races - Continue Askosi development -- Improve audiovisuals and AI +- Further improve audiovisuals and AI - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! -## Config -- A new advisor, **Goku**, has been added! (c. 3crow) -- The advisors **Mesk** and **ISN** have been deprecated by author request. If you get an error message on launch, consider removing them from your configs. - ## Bugfixes - **Stability:** - - Resolved a common crash after warping in a Monument of Sin (r. HitEmUp & Sosij, c. DF) -- **Gameplay:** - - Fixed **Liiralisk** bounces being able to bounce to airborne enemies - - Prevented **Autovitality** timers from expiring while stunned (r. Kasuga) -- **AI:** - - Resolved an issue preventing Zerg AI from making **Axtoth Axis** and related units (r. GreenEggs'NSpam) - - Resolved issues with Zerg AI attack wave creation -- **Audiovisual:** - - Enabled construction init SFX for Zerg gas caps - - Fixed icon display for **Solarion** hangar (r. jakulangski, c. DF) - - Corrected filenames for a few miscellaneous sound files (r. Mimika) + - Prospectively resolved Zerg AI panic + - Resolved more iscript errors (r. TheBeaver99) +- **Audiovisuals:** + - Restored graphical functionality of the Iziralisk (r. lolrsk8s & 3crow) + - Made 'no corpse' behaviors spawn a consumed corpse for better visual feedback + - Updated Matador production icon + - Resolved slight game timer slowness (r. & c. DF) + - Resolved asynchronous replay and game timers (r. The Shambler, c. DF) ## Audiovisuals -- New model for: - - **Legionnaire** *(c. Solstice, wireframe c. jun3hong)* - - **Izirokor** -- New portrait for: - - **Legionnaire** *(c. Solstice)* -- Improved overlay visuals for: - - **Savant - Power Siphon** - -## Triggers -- Added the following behaviors to the `set_unit_behavior` crig action: - - `no_collision` -- the unit will not collide with other ground units - - `air_transport` -- if the unit is a transport, it can transport air units +- New sprite for: + - **Autocort** (c. DeltaCadimus) +- Improved sprite for: + - **Aspirant** (c. Mimika) +- New VFX for: + - Protoss unit completion (assistance by DF!) +- New SFX for: + - 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, Egg & Cocoon) + - Attack windup (Optecton) + - Building response (Ancestral Archives) + - Death (Gorgrokor) + - Corpse consumption (Ultrokor) +- Modified SFX for: + - Ambient training SFX (Ministry, Embassy, Lattice) ## Terran +- For units with windups, added a slight forgiveness period to allow more movement and retargeting - [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos): - - **Fusion Sealers** removed + - Vision range 8 » 7 +- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian): + - **Twin Railguns:** + - Attack windup 0 » 0.33 seconds - [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant): - - Resource costs 100/50 » 125/50 - - **Discoid Rifle:** - - **Power Siphon** attack cooldown 0.75 » 0.83 (matches **Entropy Gauntlets**) -- [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack): - - Build time 18 » 16 -- [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx): - - Build time 28 » 30 -- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): - - Build time 30 » 25 - - **Halo Rockets:** - - Weapon cooldown 1.08 » 0.92 - - Weapon range 6 » 7 - - Weapon still fired at 6 range, improving chase potential -- [Ancile](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ancile): - - Vision range 10 » 8 -- [Salamander](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/salamander): - - **Perdition Barrage:** - - Attack count 3 » 6 -- [Vestry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vestry): - - Resource costs 150/75 » 150/50 -- [Covenant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/covenant): - - Resource costs 100/250 » 100/350 -- **NEW:** [Ogun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ogun): - - Sturdy constructor with a repair-oriented deployment and **Fusion Sealers** - - Trained from Ministry or Treasury; requires Quarry -- **NEW:** [Cannibal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cannibal): - - **Upstart only!** Raiding infantry; replaces Cyprian + - 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 -- [Witness](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/witness): - - Resource costs 50/75 » 50/50 -- **NEW:** [Autocort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/autocort): - - Advanced constructor with personal power field - - Trained from Embassy +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - **Sunsplit Beam:** + - Windup 0.95 » 1.67 +- [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold): + - Vision range 8 » 7 + - Also affects **Starbound** variant +- [Oscilliant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/oscilliant): + - **Rotating Ray:** + - Armor penetration 5 » 3 ## Zerg -- [Gosvileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gosvileth): - - **Plethoral Gestation** removed - - **NEW: Aberrant Gestation:** - - Gosvileths now mutate into advanced structure strains -- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk): - - Resource costs 75/25 » 100/25 - - **Hollowed Glaves:** - - Armor penetration 2 » 1 - - **Homing Spore:** - - Armor penetration 0 » 1 -- [Sovroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sovroleth): - - Build time 25 » 24 - - **Corpse Cocoon:** - - Gestation time 4 » 12 (half of training time) -- [Sasyrvoleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sasyrvoleth): - - Resource costs 100/200 » 100/300 - - Build time 30 » 40 - - HP 140 » 200 - - Movement speed 5 » 4.16 -- [Zarcavrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zarcavrokor): - - Movement speed 5.4 » 4.2 -- [Kalkiir Lake](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kalkiir-lake): - - Resource costs 200/100 » 200/200 - - Time cost 40 » 50 -- **NEW:** [Agrileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/agrileth): - - Mobile hive organ; has **Plethoral Gestation** - - Morphed from Larvae; requires Quazeth Pool or mutation \ No newline at end of file +- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): + - Vision range 9 » 7 +- [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): + - Vision range 9 » 7 +- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor): + - Vision range 9 » 8 +- [Keskathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/keskathalor): + - Armor 4 » 3 + - Vision range 9 » 8 +- [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk): + - Now requires **Kethraj Keep** +- [Ulgorg Cavern](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ulgorg-cavern): + - Armor 6 » 5 +- [Zozarc Gorge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zozarc-gorge): + - Armor 8 » 6 +- **NEW:** [Kethrostalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kethrostalor): + - Unmatched artillery strain, capable of launching combatants to the frontline + - Morphed from Keskathalor; requires Kethraj Keep +- **NEW:** [Kethraj Keep](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kethraj-keep): + - Artillery assault node; mutated from Geszkath Grotto \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 1c4cc6b5..fa0340a7 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ