diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx index 11415591..7b79c456 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Death Spiral.scx index 069b102e..8a87db55 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Death Spiral.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Death Spiral.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Ex Situ.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Ex Situ.scx index 68c6cc27..991a3a40 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Ex Situ.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Ex Situ.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx index 7983778e..4a0eb6cd 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx index 272d17fc..8589f3d4 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Nightfall.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx index 430d9d33..805bee9e 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Repulsion.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Repulsion.scx index 9c05e28a..961b1e84 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Repulsion.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Repulsion.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx index 38ae04fc..323575cd 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Equilibrium.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Equilibrium.scx index 4a9599ef..e32f527f 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Equilibrium.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Equilibrium.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Pendulum.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Pendulum.scx index a0deeda9..84b8ef35 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Pendulum.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Pendulum.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Proxima.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Proxima.scx index 83456ace..8c8b7fdb 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Proxima.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Proxima.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Terminus.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Terminus.scx index 96b6dd34..471964fa 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(2)Terminus.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Terminus.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx index c09dae94..0d98227d 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(4)Oxytocin.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 2/(4)Quasar Quartet.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(4)Quasar Quartet.scx index eaa45e4a..66bd6686 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 2/(4)Quasar Quartet.scx and b/CMBW-maps/melee/1v1/Competitive Class 2/(4)Quasar Quartet.scx differ diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx index 70ea69b0..f8fbb956 100644 Binary files a/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx and b/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx differ diff --git a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx index 28ecde6a..4ee693dd 100644 Binary files a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx and b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx index 7e84417c..7c60cdd8 100644 Binary files a/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx and b/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)False Promises.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)False Promises.scx index 8a3cef2b..0027d3cc 100644 Binary files a/CMBW-maps/melee/1v1/Work in Progress/(2)False Promises.scx and b/CMBW-maps/melee/1v1/Work in Progress/(2)False Promises.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Pantheon.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Pantheon.scx new file mode 100644 index 00000000..5673b65e Binary files /dev/null and b/CMBW-maps/melee/1v1/Work in Progress/(2)Pantheon.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Swampside.scm b/CMBW-maps/melee/1v1/Work in Progress/(2)Swampside.scm index 134d3dd9..cc8b0254 100644 Binary files a/CMBW-maps/melee/1v1/Work in Progress/(2)Swampside.scm and b/CMBW-maps/melee/1v1/Work in Progress/(2)Swampside.scm differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index cc613994..c5e50499 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a9dfa8d7..459191e7 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 9c24b70a..e5d12e84 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index c9ccb88a..d5d37c63 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 4b2c6dfa..1b707dc6 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -41974,11 +41974,16 @@ MagnetarUnused1: MagnetarGndAttkInit: wait 1 + nobrkcodestart + wait 2 + playfram 0x00 + wait 1 playfram 0x11 playsndbtwn 1876 1879 # Magnetar weapon fire 01, 02, 03, 04 attack wait 1 playfram 0x00 + nobrkcodeend gotorepeatattk goto MinotaurGndAttkToIdle @@ -51473,7 +51478,7 @@ MortothrokorDeath: wait 2 playfram 174 wait 2 - lowsprul 1737 0 0 # Mortothrokor Remnants (cm\zerg\mortothrokor-remnants.grp) + lowsprul 868 0 0 # Mortothrokor Remnants (cm\zerg\mortothrokor-remnants.grp) wait 1 end diff --git a/mpq/unit/cm/terran/magnetar-attack.lol b/mpq/unit/cm/terran/magnetar-attack.lol new file mode 100644 index 00000000..88c79a7b Binary files /dev/null and b/mpq/unit/cm/terran/magnetar-attack.lol differ diff --git a/patchnotes.md b/patchnotes.md index ea8dbcaa..59914463 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -24,20 +24,26 @@ Patch goals include: - Joining a lobby now plays a sound (with help from DF) ## Bugfixes +- Stability: + - Fixed a very rare crash related to the Mortothrokor death animation (r. TheBeaver99) - Gameplay: - Zerg regression will no longer fail if the attacker is killed or otherwise unavailable before their projectile kills the Zerg target (r. Mystery Meat & DF) - Partially-resolved an issue with Zerg regression on burrowed units (r. lolrsk8s) - Mind Tyrany Maelstrom now correctly slows flingy units - Claymore Kelvin Munitions is now correctly cleared for flingy units (r. TheBeaver99) - Salvage has been removed for real this time (r. lucifirius & GreenEggs'NSpam) + - Fixed failed Magnetar attacks when turning or at max range (r. Mystery Meat) - Savant Power Siphon now correctly reduces the attack rate of turreted units (e.g. Goliaths) (r. GreenEggs'NSpam) - Units which transform from other units (i.e. regression, Vagrant, Axitrilisk) now properly inherit their facing angles (r. TheBeaver99) - Resolved hotkey conflict between Analogue and Architect (r. DF), Apostle and Tinkerer's Tower (r. GreenEggs'NSpam) +- AI: + - On competitive maps (class 1 and 2), AI can no longer roll greed builds - Audiovisuals: - Names are now correctly redrawn when selecting Anchors and Lodestones - Removed the Attack button on garrisons, since it currently does nothing (r. neblime) - Improve sync between Golem attack animation and actual damage (r. TheBeaver99) - Added placeholder liftoff and landing dust overlays for Mantle and Starpad (r. TheBeaver99) + - Mortothrokors now leave behind corpses (r. TheBeaver99) - Mind Tyrant Maelstrom tooltip has been corrected - Cleaned up tooltips that referenced 'weapon range' without involving weapons - Talos now uses the Shaman portrait instead of Data Disc diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 46451ee8..61ebe294 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ