diff --git a/master changelog.md b/master changelog.md index 9ea5c86..d1e3d69 100644 --- a/master changelog.md +++ b/master changelog.md @@ -5,6 +5,7 @@ Since December 2022, this changelog shows only past changes. See patchnotes.md for info on the most recent patch! # Table of Contents +- [20 June 2025](#20-june-2025) - [3 May 2025](#3-may-2025) - [19 April 2025](#19-april-2025) - [5 April 2025](#5-april-2025) @@ -101,6 +102,93 @@ See patchnotes.md for info on the most recent patch! - [13 August 2020](#13-august-2020) - [12 August 2020](#12-august-2020) +# 20 June 2025 +## Year 3, month 6, patch 1 + +## Patch goals +- Make small balance tweaks for Acropolis #3 - Battlements & Throneroom +- Continue under-the-hood changes for Askosi implementation +- Add and improve some audiovisuals + +## Core +- Updated title music (c. Enozlliks) +- Added error handling for iscript-based errors. If you see any debug messages, screenshot them and show them to Pr0nogo! + - [Here's an example error!](https://files.catbox.moe/pijec3.png) + +## Game Modes +- **Massacre:** + - Units created from abilities are no longer doubled +- **Embraced:** + - No longer applies infestation debuffs (still applies buffs) + - Now spawns broodspawn equivalent to 10% of the unit's resource cost on death +- **NEW: Deathmarch:** + - Massacre and The Turning rules apply! +- **NEW: Brotherhood:** (b. 3crow) + - All units split like the Simulacrum! Shieldless units take longer to replicate. + +## Bugfixes +- **Stability:** + - Resolved several iscript-based bugs that could have lead to game instability +- **Gameplay:** + - **Plague** can now correctly bypass **Carapace Swarm** (r. jakulangski) + - Units with shields no longer take invalid shield damage through **Carapace Swarm** (r. jakulangski) + - Lardfix: Units directly on top of each other (exact same pixel coordinate) no longer prevent each other from firing (c. DF) + +## Audiovisuals +- New sprite for: + - Idol (c. DeltaCadimus, a. Solstice) +- Adjusted sprite for: + - Corrosive Touch death explosion +- Added several new icons (c. Raenarill & jakulangski) + +## Terran +- **Apollyoid Adhesive:** + - Armor rend cap ∞ » 3 + - Timer now refreshes when attacked by any weapon +- [Harakan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan): + - HP 90 » 100 +- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian): + - HP 65 » 75 +- [Harakan (Golden Republic)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan-golden): + - Shields 30 » 40 + +## Protoss +- [Potentate](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/potentate): + - **Phase Saber** removed + - **Transcendent Tide:** + - Effect range 4 » 3 + - Now procs when attacking an enemy within 3 range +- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol): + - HP 70 » 80 + +## Zerg +- **Hidebreaker:** + - **Vorvrokor** and **Nathrokor**-sourced Hidebreakers now stack with each other +- **Plague:** + - Now consumes corpse on afflicted unit death +- **Broodspawn:** + - On death, Corrosive Touch timer 1 second » 2 seconds +- [Kagralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kagralisk): + - Resource costs 100/50 » 100/100 + - Movement speed 4.8 » 4 + - Vision range 8 » 9 + - Transport weight 2 » 3 + - **Repeating Venom:** + - Weapon damage 4x6 » 2x5 + - Weapon cooldown 1.33 » 1 + - **NEW: Miasma** + - Attacks now apply plague to targets for 1.5 seconds. Miasma fields released on death last for 2 seconds. +- [Cherbrathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cherbrathalor): + - Transport weight 4 » 8 + - **Venemous Bursts:** + - Weapon damage 4x8 » 4x4 + - **NEW: Miasma** + - Same as Kagralisk. +- [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk): + - Transport weight 6 » 10 +- [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor): + - Resource cost 125/100 >> 150/100 + # 3 May 2025 ## Year 3, month 5, patch 1 diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 31e1b49..bf787e5 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 6ccf16a..11da6e0 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -127,7 +127,7 @@ Carapace Swarm Flag Young Chrysalis Psi Emitter -Large Protoss Laser +Data Disk Khaydarin Crystal Mineral Chunk Type1 Mineral Chunk Type2 @@ -205,8 +205,8 @@ Subterranean Spines Corrosive Acid Shot Corrosive Acid Hit Neutron Flare -Vorvrokor -Bactalisk +Uraj +Khalis Copy of Skryling Copy of Maverick Quarry @@ -563,13 +563,13 @@ Manifold (Starbound) Yblyleth Terran Heavy Missile Aion Pilgrim -Extended Flingy #357 -Extended Flingy #358 -Extended Flingy #359 -Extended Flingy #360 -Extended Flingy #361 -Extended Flingy #362 -Extended Flingy #363 +Large Protoss Laser +Vorvrokor +Bactalisk +Blackguard +Arhaun Projectile +Arhaun Base +Arhaun Turret Extended Flingy #364 Extended Flingy #365 Extended Flingy #366 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 295f372..21cc02e 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 8259734..bb79b2e 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 edceddb..8e472e6 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -201,7 +201,7 @@ Stargate Stargate Overlay Stargate Warp Flash Stargate Shadow -Stasis Cell/Prison +Stasis Cell Robotics Support Bay Robotics Support Bay Warp Flash Robotics Support Bay Shadow @@ -912,7 +912,7 @@ Unknown Desert Shadow 12/1 Desert Overlay 11/3 Desert Wraith Engines -Lurker Egg +Lakizilisk Egg (Unused) Vithrilisk Vithrilisk Shadow Vithrilisk Birth @@ -956,8 +956,8 @@ Kakaru (Twilight) Kakaru (Twilight) Shadow Ursadon (Ice) Ursadon (Ice) Shadow -Vorvrokor -Bactalisk +Uraj +Khalis Halo Rockets Trail Subterranean Spines Corrosive Acid Shot @@ -1780,7 +1780,7 @@ Ocsal Regression Overlay Tyranny Overlay Nathrok Lake Mortothrokor Birth -Skithrok Scab +Skibact Scab Mortothrokor Passive Overlay Quarry Connector Qilin @@ -2042,15 +2042,15 @@ Askosi Structure Rubble (Large) Pilgrim Pilgrim Shadow Corrosive Touch Explosion Small -Extended Image #1042 -Extended Image #1043 -Extended Image #1044 -Extended Image #1045 -Extended Image #1046 -Extended Image #1047 -Extended Image #1048 -Extended Image #1049 -Extended Image #1050 +Skibact Scab Shadow +Vorvrokor +Bactalisk +Stasis Cell Shadow +Blackguard +Blackguard Shadow +Arhaun Base +Arhaun Turret +Arhaun Shadow Extended Image #1051 Extended Image #1052 Extended Image #1053 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 55e3f07..13a7092 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 152a9f8..96ea8a8 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -1193,8 +1193,8 @@ Cyprian Weapon Fire 02 Cyprian Weapon Fire 03 Cyprian Weapon Fire 04 Cyprian Weapon Fire 05 -Spraith Colony Weaponhit 01 -Spraith Colony Weaponhit 02 +Spraith Cesiant Weaponhit 01 +Spraith Cesiant Weaponhit 02 Pazuzu Weapon Fire 01 Pazuzu Weapon Fire 02 Idol Ready 01 @@ -3510,20 +3510,20 @@ Cikralisk Death 01 Cikralisk Death 02 Cikralisk Death 03 Apostle Revive 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 +Blackguard Charge 01 +Blackguard Charge 02 +Blackguard Charge 03 +Blackguard Charge 04 +Blackguard Weaponfire 01 +Blackguard Weaponfire 02 +Blackguard Weaponfire 03 +Blackguard Weaponfire 04 +Arhaun Weaponfire 01 +Arhaun Weaponfire 02 +Arhaun Weaponfire 03 +Hydralisk Orkoti Weaponfire 01 +Hydralisk Orkoti Weaponfire 02 +Hydralisk Orkoti Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index d66d514..05006a2 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3509,4 +3509,18 @@ cm\z\cikralisk\hlp-04.wav cm\z\cikralisk\dth-01.wav cm\z\cikralisk\dth-02.wav cm\z\cikralisk\dth-02.wav -cm\t\apostle\revive-01.wav \ No newline at end of file +cm\t\apostle\revive-01.wav +cm\f-t\blackguard\ch-01.wav +cm\f-t\blackguard\ch-02.wav +cm\f-t\blackguard\ch-03.wav +cm\f-t\blackguard\ch-04.wav +cm\f-t\blackguard\wf-01.wav +cm\f-t\blackguard\wf-02.wav +cm\f-t\blackguard\wf-03.wav +cm\f-t\blackguard\wf-04.wav +cm\f-t\arhaun\wf-01.wav +cm\f-t\arhaun\wf-02.wav +cm\f-t\arhaun\wf-03.wav +cm\f-z\hydralisk-orkoti\wf-01.wav +cm\f-z\hydralisk-orkoti\wf-02.wav +cm\f-z\hydralisk-orkoti\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 3ebd478..ae65396 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 0f65177..ca1c189 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -288,7 +288,7 @@ Carapace Swarm Flag Young Chrysalis Psi Emitter -Large Protoss Laser +Data Disk Khaydarin Crystal Mineral Chunk Type1 Mineral Chunk Type2 @@ -513,8 +513,8 @@ Subterranean Spines Corrosive Acid Shot Corrosive Acid Hit Maelstrom Hit -Vorvrokor -Bactalisk +Uraj +Khalis Matador Starpad Matrix @@ -1006,12 +1006,12 @@ Askosi Structure Rubble (Large) Pilgrim Corrosive Touch Explosion Small Askosi Structure Rubble (Small) -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Large Protoss Laser +Vorvrokor +Bactalisk +Blackguard +Arhaun Base +Arhaun Turret Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 2a4747a..815ed7d 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 c5f712f..56f2418 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -463,33 +463,33 @@ Askosi Cipher Askosi Function Askosi Gauntlet Askosi Cosmoscope -Extended Unit #238 -Extended Unit #239 -Extended Unit #240 -Extended Unit #241 -Extended Unit #242 -Extended Unit #243 -Extended Unit #244 -Extended Unit #245 -Extended Unit #246 -Extended Unit #247 -Extended Unit #248 -Extended Unit #249 -Extended Unit #250 -Extended Unit #251 -Extended Unit #252 -Extended Unit #253 -Extended Unit #254 -Extended Unit #255 -Extended Unit #256 -Extended Unit #257 -Extended Unit #258 -Extended Unit #259 -Extended Unit #260 -Extended Unit #261 -Extended Unit #262 -Extended Unit #263 -Extended Unit #264 +Ragnasaur (Ashworld) +Rhynadon (Badlands) +Bengalaas (Jungle) +Scantid (Desert) +Ursadon (Ice) +Kakaru (Twilight) +Flag +Young Chrysalis +Psi Emitter +Data Disk +Khaydarin Crystal +Uraj +Khalis +Mineral Chunk +Mineral Chunk Depleted +Terran Vespene +Terran Vespene Depleted +Protoss Vespene +Protoss Vespene Depleted +Zerg Vespene +Zerg Vespene Depleted +Terran Beacon +Protoss Beacon +Zerg Beacon +Terran Blackguard +Terran Arhaun (Base) +Arhaun Turret Extended Unit #265 Extended Unit #266 Extended Unit #267 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 3f6e6ba..0473dc6 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 c33fec4..6f2154e 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -238,8 +238,8 @@ Gauss Slugger (Maverick Futurist) Needle Spores (Hydralisk Orkoti) Inzor Reflux (Inzorthrokor) Mining Saber (Pilgrim) -Extended Weapon #111 -Extended Weapon #112 +Asoni Carbine (Blackguard) +Phlegethon Cannons (Arhaun) Extended Weapon #113 Extended Weapon #114 Extended Weapon #115 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index de571b1..dcaa62a 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 3bbcdaa..4391de8 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 09ccee1..f7f4e84 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 9f1377c..e599076 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 866028a..4cb823f 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 8cd4e97..47e6e3b 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index 4be1ec6..bf6ad8e 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -1,103 +1,92 @@ # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 338 Ragnasaur (neutral\Acritter.grp) +# 338 Ragnasaur (Ash) (neutral\Acritter.grp) .headerstart IsId 198 Type 12 -Init RagnasaurInit -Death RagnasaurDeath -GndAttkInit RagnasaurGndAttkInit -AirAttkInit RagnasaurGndAttkInit +Init Ragnasaur_AshworldCritter_Init +Death Ragnasaur_AshworldCritter_Death +GndAttkInit [NONE] +AirAttkInit [NONE] Unused1 [NONE] -GndAttkRpt RagnasaurGndAttkInit -AirAttkRpt RagnasaurGndAttkInit -CastSpell RagnasaurCastSpell -GndAttkToIdle RagnasaurGndAttkToIdle -AirAttkToIdle RagnasaurGndAttkToIdle +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] Unused2 [NONE] -Walking RagnasaurWalking -WalkingToIdle RagnasaurGndAttkToIdle +Walking Ragnasaur_AshworldCritter_Walking +WalkingToIdle Ragnasaur_AshworldCritter_WalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # -RagnasaurInit: - imgul 339 0 0 # Ragnasaur Shadow (neutral\nacShad.grp) -RagnasaurGndAttkToIdle: - playfram 0x00 +Ragnasaur_AshworldCritter_Init: + imgul 339 0 0 # Ragnasaur (Ash) Shadow (neutral\nacShad.grp) +Ragnasaur_AshworldCritter_WalkingToIdle: + playfram 0x66 goto SkryrokorLocal00 -RagnasaurDeath: - playsndbtwn 276 277 # Maverick death 01, 02 - imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 3 +Ragnasaur_AshworldCritter_Death: + playsnd 53 # Misc\CRITTERS\LCrDth00.wav + setfldirect 0 + playfram 0x99 + wait 1 + playfram 154 + wait 1 + playfram 155 + wait 1 + playfram 156 + wait 1 + playfram 157 + wait 1 + playfram 158 + wait 1 + playfram 159 + wait 1 + playfram 160 + wait 1 end -RagnasaurGndAttkInit: - playfram 0x00 - wait 1 -RagnasaurGndAttkRpt: - nobrkcodestart - playfram 0x11 - wait 1 - playfram 0x22 - playsndbtwn 1189 1193 # Ragnasaur weaponfire 01, 02, 03, 04, 05 - attackwith 1 - wait 1 - playfram 0x11 - wait 1 - nobrkcodeend - gotorepeatattk - goto RagnasaurGndAttkToIdle - -RagnasaurCastSpell: - playsnd 974 # Misc\CRITTERS\ScWht03.wav - wait 1 - goto RagnasaurGndAttkToIdle - -RagnasaurWalking: - move 3 - wait 1 - playfram 0x11 - move 3 - wait 1 - playfram 0x33 - move 3 - wait 1 - playfram 0x44 - move 3 - wait 1 - playfram 0x55 - move 3 - wait 1 - playfram 0x66 - move 3 +Ragnasaur_AshworldCritter_Walking: + move 4 wait 1 playfram 0x77 - move 3 + move 4 wait 1 playfram 0x88 - move 3 + move 4 wait 1 - playfram 0x99 - move 3 + playfram 0x00 + move 4 wait 1 - playfram 0xaa - move 3 + playfram 0x11 + move 4 wait 1 - playfram 0xbb - move 3 + playfram 0x22 + move 4 wait 1 - playfram 0xcc - move 3 + playfram 0x33 + move 4 wait 1 - playfram 0xdd - move 3 + playfram 0x44 + move 4 wait 1 - playfram 0xee - move 3 + playfram 0x55 + move 4 wait 1 - goto RagnasaurWalking + playfram 0x66 + goto Ragnasaur_AshworldCritter_Walking + +InfestedTerranWalkingToIdle: + playfram 0x00 +SkryrokorLocal00: + wait 125 + goto SkryrokorLocal00 + +Generic_Wait1End: + wait 1 + end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -209,9 +198,9 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # Bengalaas_JungleCritter_Init: - imgul 343 0 0 # Bengalaas (Jungle) Shadow (neutral\njcShad.grp) + imgul 343 0 0 # Bengalaas (Jungle) Shadow (neutral\njcShad.grp) Bengalaas_JungleCritter_WalkingToIdle: - playfram 0x00 + playfram 0x00 # Frame set 0 goto SkryrokorLocal00 Bengalaas_JungleCritter_Death: @@ -3346,16 +3335,6 @@ KhaydarinEclipseProtossAccelerantDeath: wait 1 end -InfestedTerranWalkingToIdle: - playfram 0x00 -SkryrokorLocal00: - wait 125 - goto SkryrokorLocal00 - -Generic_Wait1End: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 769 8/3 Twilight1 (thingy\tileset\twilight\rstatue.grp) @@ -4290,4 +4269,307 @@ DurendalWeaponfireInit: wait 1 goto Generic_Wait1End +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 952 Scantid (Desert) (neutral\Kcritter.grp) +.headerstart +IsId 375 +Type 12 +Init Scantid_DesertCritter_Init +Death Scantid_DesertCritter_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Scantid_DesertCritter_Walking +WalkingToIdle Scantid_DesertCritter_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Scantid_DesertCritter_Init: + imgul 953 0 0 # Scantid (Desert) Shadow (neutral\nckShad.grp) +Scantid_DesertCritter_WalkingToIdle: + playfram 0x66 + goto SkryrokorLocal00 + +Scantid_DesertCritter_Death: + playsnd 975 # Misc\CRITTERS\ScDeath01.wav + setfldirect 0 + playfram 0xcc + wait 2 + playfram 205 + wait 2 + playfram 206 + wait 2 + playfram 207 + wait 2 + playfram 208 + wait 2 + playfram 209 + wait 2 + playfram 210 + wait 2 + playfram 211 + wait 2 + end + +Scantid_DesertCritter_Walking: + move 4 + wait 1 + playfram 0x77 + move 4 + wait 1 + playfram 0x88 + move 4 + wait 1 + playfram 0x00 + move 4 + wait 1 + playfram 0x11 + move 4 + wait 1 + playfram 0x22 + move 4 + wait 1 + playfram 0x33 + move 4 + wait 1 + playfram 0x44 + move 4 + wait 1 + playfram 0x55 + move 4 + wait 1 + playfram 0x66 + move 4 + wait 1 + playfram 0x77 + move 4 + wait 1 + playfram 0x88 + move 4 + wait 1 + playfram 0x99 + move 4 + wait 1 + playfram 0xaa + move 4 + wait 1 + playfram 0xbb + goto Scantid_DesertCritter_Walking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 954 Kakaru (Twilight) (neutral\Scritter.grp) +.headerstart +IsId 376 +Type 12 +Init Kakaru_TwilightCritter_Init +Death Kakaru_TwilightCritter_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Kakaru_TwilightCritter_Walking +WalkingToIdle Kakaru_TwilightCritter_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Kakaru_TwilightCritter_Init: + imgul 955 0 42 # Kakaru (Twilight) Shadow (neutral\Scritter.grp) +Kakaru_TwilightCritter_WalkingToIdle: + playfram 0x00 + wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 + playfram 0x44 + wait 2 + playfram 0x55 + wait 2 + playfram 0x66 + wait 2 + playfram 0x77 + wait 2 + playfram 0x88 + wait 2 + playfram 0x99 + wait 2 + playfram 0xaa + wait 2 + playfram 0xbb + wait 2 + goto Kakaru_TwilightCritter_WalkingToIdle + +Kakaru_TwilightCritter_Death: + playsnd 979 # Misc\CRITTERS\TerDeath01.wav + setfldirect 0 + playfram 0xcc + wait 2 + playfram 205 + wait 2 + playfram 206 + wait 2 + playfram 207 + wait 2 + playfram 208 + wait 2 + playfram 209 + wait 2 + playfram 210 + wait 2 + playfram 211 + wait 2 + playfram 212 + wait 2 + playfram 213 + wait 2 + end + +Kakaru_TwilightCritter_Walking: + playfram 0x00 + wait 1 + 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 0x77 + wait 1 + playfram 0x88 + wait 1 + playfram 0x99 + wait 1 + playfram 0xaa + wait 1 + playfram 0xbb + wait 1 + goto Kakaru_TwilightCritter_Walking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 956 Ursadon (Ice) (neutral\Icritter.grp) +.headerstart +IsId 377 +Type 12 +Init Ursadon_IceCritter_Init +Death Ursadon_IceCritter_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Ursadon_IceCritter_Walking +WalkingToIdle Ursadon_IceCritter_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Ursadon_IceCritter_Init: + imgul 957 0 0 # Ursadon (Ice) Shadow (neutral\ncicShad.grp) +Ursadon_IceCritter_WalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +Ursadon_IceCritter_Death: + playsnd 971 # Misc\CRITTERS\PBDeath01.wav + setfldirect 0 + playfram 0x88 + wait 2 + playfram 137 + wait 2 + playfram 138 + wait 2 + playfram 139 + wait 2 + playfram 140 + wait 50 + playfram 141 + wait 50 + playfram 142 + wait 50 + playfram 143 + wait 50 + end + +Ursadon_IceCritter_Walking: + move 4 + wait 1 + playfram 0x00 + move 4 + wait 1 + playfram 0x11 + move 4 + wait 1 + playfram 0x22 + move 4 + wait 1 + playfram 0x33 + move 4 + wait 1 + playfram 0x44 + move 4 + wait 1 + playfram 0x55 + move 4 + wait 1 + playfram 0x66 + move 4 + wait 1 + playfram 0x77 + goto Ursadon_IceCritter_Walking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 393 Young Chrysalis (neutral\KerrEgg.grp) +.headerstart +IsId 220 +Type 1 +Init YoungChrysalisInit +Death YoungChrysalisDeath +.headerend +# ----------------------------------------------------------------------------- # + +YoungChrysalisInit: + playfram 0x00 + pwrupcondjmp YoungChrysalisLocal00 + imgul 415 0 0 # Young Chrysalis Shadow (Ground) (neutral\nkeShad.grp) + goto SkryrokorLocal00 + +YoungChrysalisLocal00: + wait 1 + switchul 416 # Young Chrysalis Shadow (Carried) (neutral\nkeSha2.grp) + goto SkryrokorLocal00 + +YoungChrysalisDeath: + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + end + ## Next free IsId: 829 \ No newline at end of file diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 431f8c1..e77b572 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 cd5fe83..ea05665 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -2995,11 +2995,11 @@ StargateOverlayDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 203 Stasis Cell/Prison (neutral\stasis.grp) +# 203 Stasis Cell (neutral\stasis.grp) .headerstart IsId 187 Type 20 -Init StasisCell_PrisonInit +Init StasisCell_Init Death ForgeDeath GndAttkInit [NONE] AirAttkInit [NONE] @@ -3015,7 +3015,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built StasisCell_PrisonInit +Built StasisCell_Built Landing [NONE] LiftOff [NONE] IsWorking SkryrokorLocal00 @@ -3024,7 +3024,9 @@ WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -StasisCell_PrisonInit: +StasisCell_Init: + imgul 2047 0 0 # Stasis Cell Shadow (neutral\stasis-cell-shadow.grp) +StasisCell_Built: playfram 0x00 goto SkryrokorLocal00 diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index e8b20f1..95fd3c1 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 ddbce35..1e44314 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -1878,7 +1878,7 @@ Phalanx_Tank_BaseWalking: .headerstart IsId 91 Type 13 -Init InfestedTerranWalkingToIdle +Init Phalanx_Tank_TurretInit Death Generic_Wait1End GndAttkInit Phalanx_Tank_TurretGndAttkInit AirAttkInit [NONE] @@ -1886,14 +1886,37 @@ Unused1 SkryrokorLocal00 GndAttkRpt Phalanx_Tank_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle SkryrokorLocal00 +GndAttkToIdle Phalanx_Tank_TurretInit AirAttkToIdle [NONE] Unused2 [NONE] Walking SkryrokorLocal00 -WalkingToIdle SkryrokorLocal00 +WalkingToIdle Phalanx_Tank_TurretInit SpecialState1 SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # + +Phalanx_Tank_TurretInit: + playfram 0x00 +Phalanx_Tank_TurretLocal00: + wait 1 + waitrand 62 74 + randcondjmp 230 Phalanx_Tank_TurretLocal00 + sigorder 8 + randcondjmp 127 Phalanx_Tank_TurretLocal01 + turnccwise 1 + wait 3 + turnccwise 1 + wait 3 + turnccwise 1 + goto Phalanx_Tank_TurretLocal00 + +Phalanx_Tank_TurretLocal01: + turn1cwise + wait 3 + turn1cwise + wait 3 + turn1cwise + goto Phalanx_Tank_TurretLocal00 Phalanx_Tank_TurretGndAttkInit: wait 1 @@ -1927,7 +1950,7 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking [NONE] +Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 Phalanx_Siege_BaseSpecialState2 @@ -2021,7 +2044,7 @@ CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 AirAttkToIdle [NONE] Unused2 [NONE] -Walking [NONE] +Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 SkryrokorLocal00 SpecialState2 Phalanx_Siege_TurretSpecialState2 @@ -7944,8 +7967,8 @@ CastSpell [NONE] GndAttkToIdle MadcapGndAttkToIdle AirAttkToIdle MadcapGndAttkToIdle Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 SavantSpecialState1 SpecialState2 SavantEntropyGauntletsTransform AlmostBuilt [NONE] @@ -18825,3 +18848,117 @@ MaelstromHitInit: playfram 8 wait 2 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2048 Blackguard (cm\faction-t\blackguard.grp) +.headerstart +IsId 828 +Type 12 +Init BlackguardInit +Death MadcapDeath +GndAttkInit BlackguardGndAttkInit +AirAttkInit BlackguardGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt BlackguardGndAttkRpt +AirAttkRpt BlackguardGndAttkRpt +CastSpell [NONE] +GndAttkToIdle MadcapGndAttkToIdle +AirAttkToIdle MadcapGndAttkToIdle +Unused2 [NONE] +Walking MadcapWalking +WalkingToIdle MadcapWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +BlackguardInit: + imgul 2049 0 0 # Blackguard Shadow (cm\faction-t\blackguard-shadow.grp) + goto MadcapWalkingToIdle + +BlackguardGndAttkInit: + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 +BlackguardGndAttkRpt: + wait 1 + nobrkcodestart + playsndbtwn 3512 3515 # Blackguard weapon charge 01, 02, 03, 04 + wait 1 + playfram 0x180 + wait 11 + attack + playfram 0x1A0 + wait 1 + playfram 0x180 + nobrkcodeend + gotorepeatattk + ignorerest + goto MadcapGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2050 Arhaun Base (cm\faction-t\arhaun-base.grp) +.headerstart +IsId 826 +Type 12 +Init Arhaun_Base_Init +Death Goliath_Base_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 Goliath_Base_Unused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Goliath_Base_Walking +WalkingToIdle Goliath_Base_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Arhaun_Base_Init: + imgul 2052 0 0 # Arhaun Shadow (cm\faction-t\arhaun-shadow.grp) + goto Goliath_Base_WalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2051 Arhaun Turret (cm\faction-t\arhaun-turret.grp) +.headerstart +IsId 827 +Type 12 +Init Goliath_Turret_Init +Death Generic_Wait1End +GndAttkInit Arhaun_Turret_GndAttkInit +AirAttkInit Arhaun_Turret_GndAttkInit +Unused1 [NONE] +GndAttkRpt Arhaun_Turret_GndAttkInit +AirAttkRpt Arhaun_Turret_GndAttkInit +CastSpell [NONE] +GndAttkToIdle Goliath_Turret_Init +AirAttkToIdle Goliath_Turret_Init +Unused2 [NONE] +Walking Goliath_Turret_Walking +WalkingToIdle Goliath_Turret_Init +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Arhaun_Turret_GndAttkInit: + wait 1 + nobrkcodestart + playfram 0xdd + playsndbtwn 3520 3522 # Arhaun weaponfire 01, 02, 03 + attackwith 1 + attackwith 1 + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto Goliath_Turret_Init \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 871350c..1c9ed8f 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 941864f..7830d95 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -6989,7 +6989,7 @@ IrolIrisIsWorking: # 1095 Nathrokor (cm\zerg\nathrokor.grp) .headerstart IsId 451 -Type 12 +Type 14 Init NathrokorInit Death NathrokorDeath GndAttkInit NathrokorGndAttkInit @@ -7003,7 +7003,9 @@ AirAttkToIdle NathrokorGndAttkToIdle Unused2 [NONE] Walking NathrokorWalking WalkingToIdle NathrokorGndAttkToIdle -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 +SpecialState2 SkryrokorLocal00 +AlmostBuilt SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -7453,7 +7455,7 @@ GndAttkToIdle SurkithCesiantGndAttkToIdle AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SurkithCesiantIsWorking SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt SurkithCesiantAlmostBuilt @@ -16304,3 +16306,39 @@ CorrosiveTouchExplosionInit: playfram 14 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1782 Skibact Scab (cm\zerg\skibact-scab.grp) +.headerstart +IsId 830 +Type 20 +Init SkibactScabInit +Death HydrithDenDeath +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 HydrithDenAlmostBuilt +Built HydrithDenBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking HydrithDenIsWorking +WorkingToIdle HydrithDenWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SkibactScabInit: + imgul 2044 0 0 # Skibact Scab Shadow (cm\zerg\skibact-scab-shadow.grp) + playfram 0x00 + goto HydrithDenWorkingToIdle diff --git a/mpq/sound/cm/f-t/arhaun/wf-01.wav b/mpq/sound/cm/f-t/arhaun/wf-01.wav new file mode 100644 index 0000000..3b85a54 Binary files /dev/null and b/mpq/sound/cm/f-t/arhaun/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/arhaun/wf-02.wav b/mpq/sound/cm/f-t/arhaun/wf-02.wav new file mode 100644 index 0000000..ceec864 Binary files /dev/null and b/mpq/sound/cm/f-t/arhaun/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/arhaun/wf-03.wav b/mpq/sound/cm/f-t/arhaun/wf-03.wav new file mode 100644 index 0000000..bcc98d6 Binary files /dev/null and b/mpq/sound/cm/f-t/arhaun/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-01.wav b/mpq/sound/cm/f-t/blackguard/ch-01.wav new file mode 100644 index 0000000..46e7b5d Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-01.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-02.wav b/mpq/sound/cm/f-t/blackguard/ch-02.wav new file mode 100644 index 0000000..6dead53 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-02.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-03.wav b/mpq/sound/cm/f-t/blackguard/ch-03.wav new file mode 100644 index 0000000..61cc542 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-04.wav b/mpq/sound/cm/f-t/blackguard/ch-04.wav new file mode 100644 index 0000000..6a69b5b Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-04.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-01.wav b/mpq/sound/cm/f-t/blackguard/wf-01.wav new file mode 100644 index 0000000..5197687 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-02.wav b/mpq/sound/cm/f-t/blackguard/wf-02.wav new file mode 100644 index 0000000..1c67fae Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-03.wav b/mpq/sound/cm/f-t/blackguard/wf-03.wav new file mode 100644 index 0000000..ef7f65a Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-04.wav b/mpq/sound/cm/f-t/blackguard/wf-04.wav new file mode 100644 index 0000000..5715c36 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-04.wav differ diff --git a/mpq/sound/cm/f-z/hydralisk-orkoti/wf-01.wav b/mpq/sound/cm/f-z/hydralisk-orkoti/wf-01.wav new file mode 100644 index 0000000..3bceaf4 Binary files /dev/null and b/mpq/sound/cm/f-z/hydralisk-orkoti/wf-01.wav differ diff --git a/mpq/sound/cm/f-z/hydralisk-orkoti/wf-02.wav b/mpq/sound/cm/f-z/hydralisk-orkoti/wf-02.wav new file mode 100644 index 0000000..52be18f Binary files /dev/null and b/mpq/sound/cm/f-z/hydralisk-orkoti/wf-02.wav differ diff --git a/mpq/sound/cm/f-z/hydralisk-orkoti/wf-03.wav b/mpq/sound/cm/f-z/hydralisk-orkoti/wf-03.wav new file mode 100644 index 0000000..caa9680 Binary files /dev/null and b/mpq/sound/cm/f-z/hydralisk-orkoti/wf-03.wav differ diff --git a/mpq/unit/cm/faction-t/arhaun-attack.lol b/mpq/unit/cm/faction-t/arhaun-attack.lol new file mode 100644 index 0000000..028115d Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-attack.lol differ diff --git a/mpq/unit/cm/faction-t/arhaun-base.grp b/mpq/unit/cm/faction-t/arhaun-base.grp new file mode 100644 index 0000000..84ca135 Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-base.grp differ diff --git a/mpq/unit/cm/faction-t/arhaun-shadow.grp b/mpq/unit/cm/faction-t/arhaun-shadow.grp new file mode 100644 index 0000000..e8867c0 Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/arhaun-turret.grp b/mpq/unit/cm/faction-t/arhaun-turret.grp new file mode 100644 index 0000000..33cb9c6 Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-turret.grp differ diff --git a/mpq/unit/cm/faction-t/blackguard-attack.lol b/mpq/unit/cm/faction-t/blackguard-attack.lol new file mode 100644 index 0000000..2227ac1 Binary files /dev/null and b/mpq/unit/cm/faction-t/blackguard-attack.lol differ diff --git a/mpq/unit/cm/faction-t/blackguard-shadow.grp b/mpq/unit/cm/faction-t/blackguard-shadow.grp new file mode 100644 index 0000000..084dc58 Binary files /dev/null and b/mpq/unit/cm/faction-t/blackguard-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/blackguard.grp b/mpq/unit/cm/faction-t/blackguard.grp new file mode 100644 index 0000000..283b535 Binary files /dev/null and b/mpq/unit/cm/faction-t/blackguard.grp differ diff --git a/mpq/unit/cm/zerg/skibact-scab-shadow.grp b/mpq/unit/cm/zerg/skibact-scab-shadow.grp new file mode 100644 index 0000000..1af39e3 Binary files /dev/null and b/mpq/unit/cm/zerg/skibact-scab-shadow.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 5cd6f61..36c52ac 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/pcmdbtns.grp b/mpq/unit/cmdbtns/pcmdbtns.grp index 6a85e9c..5d07a1d 100644 Binary files a/mpq/unit/cmdbtns/pcmdbtns.grp and b/mpq/unit/cmdbtns/pcmdbtns.grp differ diff --git a/mpq/unit/cmdbtns/tcmdbtns.grp b/mpq/unit/cmdbtns/tcmdbtns.grp index 376d8da..eed35ce 100644 Binary files a/mpq/unit/cmdbtns/tcmdbtns.grp and b/mpq/unit/cmdbtns/tcmdbtns.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index a474156..fcbd4f0 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/cmdbtns/zcmdbtns.grp b/mpq/unit/cmdbtns/zcmdbtns.grp index 376d8da..eed35ce 100644 Binary files a/mpq/unit/cmdbtns/zcmdbtns.grp and b/mpq/unit/cmdbtns/zcmdbtns.grp differ diff --git a/mpq/unit/neutral/acritter.grp b/mpq/unit/neutral/acritter.grp deleted file mode 100644 index 3aa2179..0000000 Binary files a/mpq/unit/neutral/acritter.grp and /dev/null differ diff --git a/mpq/unit/neutral/bcritter.grp b/mpq/unit/neutral/bcritter.grp deleted file mode 100644 index 03a006f..0000000 Binary files a/mpq/unit/neutral/bcritter.grp and /dev/null differ diff --git a/mpq/unit/neutral/kcritter.grp b/mpq/unit/neutral/kcritter.grp deleted file mode 100644 index d80dd93..0000000 Binary files a/mpq/unit/neutral/kcritter.grp and /dev/null differ diff --git a/mpq/unit/neutral/kerregg.grp b/mpq/unit/neutral/kerregg.grp deleted file mode 100644 index c3cf43e..0000000 Binary files a/mpq/unit/neutral/kerregg.grp and /dev/null differ diff --git a/mpq/unit/neutral/nacshad.grp b/mpq/unit/neutral/nacshad.grp deleted file mode 100644 index f8b57d2..0000000 Binary files a/mpq/unit/neutral/nacshad.grp and /dev/null differ diff --git a/mpq/unit/neutral/nckshad.grp b/mpq/unit/neutral/nckshad.grp deleted file mode 100644 index 69e4902..0000000 Binary files a/mpq/unit/neutral/nckshad.grp and /dev/null differ diff --git a/mpq/unit/neutral/nddsha2.grp b/mpq/unit/neutral/nddsha2.grp deleted file mode 100644 index e68ca1a..0000000 Binary files a/mpq/unit/neutral/nddsha2.grp and /dev/null differ diff --git a/mpq/unit/neutral/nddshad.grp b/mpq/unit/neutral/nddshad.grp deleted file mode 100644 index a569cc8..0000000 Binary files a/mpq/unit/neutral/nddshad.grp and /dev/null differ diff --git a/mpq/unit/neutral/nkeshad.grp b/mpq/unit/neutral/nkeshad.grp deleted file mode 100644 index 63cf8fc..0000000 Binary files a/mpq/unit/neutral/nkeshad.grp and /dev/null differ diff --git a/mpq/unit/neutral/stasis-cell-shadow.grp b/mpq/unit/neutral/stasis-cell-shadow.grp new file mode 100644 index 0000000..4501b0a Binary files /dev/null and b/mpq/unit/neutral/stasis-cell-shadow.grp differ diff --git a/mpq/unit/neutral/uraj.grp b/mpq/unit/neutral/uraj.grp new file mode 100644 index 0000000..5c1c72c Binary files /dev/null and b/mpq/unit/neutral/uraj.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 7033d79..56084f4 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 b21d7eb..32cba4c 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 8bf9aea..c335b7e 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,86 +1,44 @@ -# 20 June 2025 -## Year 3, month 6, patch 1 +# 17 July 2025 +## Year 3, month 7, patch 1 ## Patch goals -- Make small balance tweaks for Acropolis #3 - Battlements & Throneroom +- Make tweaks and bugfixes for Acropolis #3's post-patch - Continue under-the-hood changes for Askosi implementation - Add and improve some audiovisuals -## Core -- Updated title music (c. Enozlliks) -- Added error handling for iscript-based errors. If you see any debug messages, screenshot them and show them to Pr0nogo! - - [Here's an example error!](https://files.catbox.moe/pijec3.png) +## Next patch +- Pr0nogo is away on holiday for 2 weeks, so the next patch will arrive around 9 August 2025! +- It will include significant changes to tech progression for Terran and Zerg, and adjust power concentration for Protoss T4 and Zerg T1 +- It may include advanced constructors for all races, depending on asset availability +- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! -## Game Modes -- **Massacre:** - - Units created from abilities are no longer doubled -- **Embraced:** - - No longer applies infestation debuffs (still applies buffs) - - Now spawns broodspawn equivalent to 10% of the unit's resource cost on death -- **NEW: Deathmarch:** - - Massacre and The Turning rules apply! -- **NEW: Brotherhood:** (b. 3crow) - - All units split like the Simulacrum! Shieldless units take longer to replicate. +## Features +- Group wireframes now display approximate energy amounts (c. DF) +- Reinstated critters, powerups, and beacons for UMS / campaign use (b. 3crow) +- Added "critter" option to "set_unit_behavior" crig action, to toggle the emulation of critter wandering for non-critter units ## Bugfixes - **Stability:** - - Resolved several iscript-based bugs that could have lead to game instability + - Fixed certain edge cases where disabling units could result in tooltip crashes (r. 3crow) + - Resolved several iscript errors that could have contributed towards game instability - **Gameplay:** - - **Plague** can now correctly bypass **Carapace Swarm** (r. jakulangski) - - Units with shields no longer take invalid shield damage through **Carapace Swarm** (r. jakulangski) - - Lardfix: Units directly on top of each other (exact same pixel coordinate) no longer prevent each other from firing (c. DF) + - Fixed transports lagging behind moving units when trying to load them (r. OyA) + - Fixed Larva and Egg replication in Brotherhood mode (r. HitEmUp) +- **Audiovisual:** + - Implemented unique shadow for Skibact Scab + - Added shadow for Stasis Cell + - Lardfix: Corrected unit responses for Ultrokor (r. DF) -## Audiovisuals -- New sprite for: - - Idol (c. DeltaCadimus, a. Solstice) -- Adjusted sprite for: - - Corrosive Touch death explosion -- Added several new icons (c. Raenarill & jakulangski) +**Audiovisuals:** +- New fidget animations for tank mode Phalanx (c. DF) +- Modified weaponfire SFX for Orkoti Hydralisk (c. lolrsk8s) ## Terran -- **Apollyoid Adhesive:** - - Armor rend cap ∞ » 3 - - Timer now refreshes when attacked by any weapon -- [Harakan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan): - - HP 90 » 100 -- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian): - - HP 65 » 75 -- [Harakan (Golden Republic)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/harakan-golden): - - Shields 30 » 40 - -## Protoss -- [Potentate](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/potentate): - - **Phase Saber** removed - - **Transcendent Tide:** - - Effect range 4 » 3 - - Now procs when attacking an enemy within 3 range -- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol): - - HP 70 » 80 +- **NEW:** [Blackguard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackguard): + - Futurist Federation; long-range penetrating infantry; replaces Madcap +- **NEW:** [Arhaun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/arhaun): + - Hecaton Coalition; anti-ground strike walker; replaces Goliath ## Zerg -- **Hidebreaker:** - - **Vorvrokor** and **Nathrokor**-sourced Hidebreakers now stack with each other -- **Plague:** - - Now consumes corpse on afflicted unit death -- **Broodspawn:** - - On death, Corrosive Touch timer 1 second » 2 seconds -- [Kagralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kagralisk): - - Resource costs 100/50 » 100/100 - - Movement speed 4.8 » 4 - - Vision range 8 » 9 - - Transport weight 2 » 3 - - **Repeating Venom:** - - Weapon damage 4x6 » 2x5 - - Weapon cooldown 1.33 » 1 - - **NEW: Miasma** - - Attacks now apply plague to targets for 1.5 seconds. Miasma fields released on death last for 2 seconds. -- [Cherbrathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cherbrathalor): - - Transport weight 4 » 8 - - **Venemous Bursts:** - - Weapon damage 4x8 » 4x4 - - **NEW: Miasma** - - Same as Kagralisk. -- [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk): - - Transport weight 6 » 10 -- [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor): - - Resource cost 125/100 >> 150/100 \ No newline at end of file +- [Lakizilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/lakizilisk): + - Movement speed 6.4 » 5 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index ca57423..ab36394 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ