diff --git a/CMBW-maps/melee/1v1/Work in Progress/(4)Highwater.scx b/CMBW-maps/melee/1v1/Work in Progress/(4)Highwater.scx index ac41a39c..8a49924e 100644 Binary files a/CMBW-maps/melee/1v1/Work in Progress/(4)Highwater.scx and b/CMBW-maps/melee/1v1/Work in Progress/(4)Highwater.scx differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 41c0d4e9..418d17b9 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 c03ad8a9..4e6d4f6b 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 e5d12e84..d313e0cc 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 1e1f4b5b..8e2b5932 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1549,8 +1549,8 @@ Simulacrum Autovitality Proc Recharge Shields Medium Recharge Shields XLarge Idol Weaponhit -Hippogriff Engines 1 -Hippogriff Engines 2 +Hippogriff Engines +unused Salamander Death Protathalor Vulture Engines diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index f03a1fee..29bd5fea 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 1f283f3b..a37b7a06 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -133,7 +133,7 @@ Zerg Hachirosk Zerg Caphrolosk Zerg Gathstelosk Zerg Nydus Cesiant -Zerg Hydrok Den +Zerg Hydrith Den Zerg Elthisth Mound Terran Olympian Zerg Matravil Nest diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index fcf09919..f17a67b4 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 74599a91..de08149c 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 44312e40..00e39c7e 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -45622,13 +45622,18 @@ HippogriffGndAttkInit: wait 1 nobrkcodestart playsndbtwn 2139 2141 # Hippogriff Cannon Weaponfire 01, 02, 03 - attack - attack - wait 3 - playsndbtwn 2139 2141 # Hippogriff Cannon Weaponfire 01, 02, 03 + playfram 0x20 attack attack wait 1 + playfram 0x00 + wait 2 + playsndbtwn 2139 2141 # Hippogriff Cannon Weaponfire 01, 02, 03 + playfram 0x40 + attack + attack + wait 1 + playfram 0x00 nobrkcodeend gotorepeatattk goto MinotaurGndAttkToIdle @@ -45664,8 +45669,7 @@ HippogriffLocal00: HippogriffWalking: setvertpos 0 -# imgol 1551 0 0 # Hippogriff Engines 1 (cm\terran\hippogriff-engines-1.grp) -# imgol 1552 0 0 # Hippogriff Engines 2 (cm\terran\hippogriff-engines-2.grp) + imgol 1551 0 0 # Hippogriff Engines (cm\terran\hippogriff-engines.grp) goto HippogriffLocal00 # ----------------------------------------------------------------------------- # diff --git a/mpq/tileset/Jungle.cv5 b/mpq/tileset/Jungle.cv5 index f7d51ca9..89b4c118 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 2f1d50e4..8da15d9c 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 11690ecf..659a3fab 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 db558f40..b7855030 100644 Binary files a/mpq/tileset/Jungle.vx4ex and b/mpq/tileset/Jungle.vx4ex differ diff --git a/mpq/unit/cm/terran/hippogriff-attack1.lol b/mpq/unit/cm/terran/hippogriff-attack1.lol new file mode 100644 index 00000000..80c29915 Binary files /dev/null and b/mpq/unit/cm/terran/hippogriff-attack1.lol differ diff --git a/mpq/unit/cm/terran/hippogriff-engines-1.grp b/mpq/unit/cm/terran/hippogriff-engines-1.grp deleted file mode 100644 index 49656be4..00000000 Binary files a/mpq/unit/cm/terran/hippogriff-engines-1.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/hippogriff-engines-2.grp b/mpq/unit/cm/terran/hippogriff-engines-2.grp deleted file mode 100644 index c0ff10b9..00000000 Binary files a/mpq/unit/cm/terran/hippogriff-engines-2.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/hippogriff-engines.grp b/mpq/unit/cm/terran/hippogriff-engines.grp new file mode 100644 index 00000000..b3898c36 Binary files /dev/null and b/mpq/unit/cm/terran/hippogriff-engines.grp differ diff --git a/mpq/unit/cm/terran/hippogriff.grp b/mpq/unit/cm/terran/hippogriff.grp index 167dda7f..55f9667a 100644 Binary files a/mpq/unit/cm/terran/hippogriff.grp and b/mpq/unit/cm/terran/hippogriff.grp differ diff --git a/patchnotes.md b/patchnotes.md index ef6f7876..ab584ff0 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -58,6 +58,11 @@ Patch goals include: - Made adjustments to how frequently Zerg request multiple tech nodes - Removed worker transfer calls to improve early-game worker efficiency +## Audiovisuals: +- Provided a new sound read for Terran proximity cloak, to contrast with Protoss passive cloak (c. lolrsk8s) +- Upgraded Hippogriff sprite with new materials, animations, and thrusters (c. Solstice) +- Diadems now leave behind large rubble, instead of small rubble + ## Bugfixes - Stability: - Fixed a common crash with Nydus Cesiants (r. Boris) @@ -75,6 +80,7 @@ Patch goals include: - Lardfix: Irradiate (from Seraph and Morningstar) now sends under attack notification (r. The Shambler) - Alkajelisks can now be mutated from Ocsal Larvae by players (r. GreenEggs'NSpam) - Azazel Defensive Matrix: no longer cleanse debuffs (r. GreenEggs'NSpam) + - Lobotomy Mine Dazing Detonation: clear slow for flingy units - Mind Tyrant Maelstrom: apply debuff to flingy units - Claymore Kelvin Munitions: clear debuff for flingy units (r. TheBeaver99) - Fixed failed Magnetar attacks when turning or at max range (r. Mystery Meat) @@ -115,10 +121,6 @@ Patch goals include: - Vagrant Shade: use the same portrait as the Vagrant (r. TheBeaver99) - Cleaned up some silent missing frame errors (r. beriso) -## Audiovisuals: -- Provided a new sound read for Terran proximity cloak, to contrast with Protoss passive cloak (c. lolrsk8s) -- Diadems now leave behind large rubble, instead of small rubble - ## Terran - [Eidolon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/eidolon): - Weapon range now 8, from 9 @@ -165,6 +167,8 @@ Patch goals include: - Weapon armor penetration now 4, from 0 - Now collides with Cataphracts, Paladins, and Architects - *Standardizing the Penumbra to use the same Kinetic Penetration rules as everyone else.* +- [Anticthon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anticthon): + - Significantly boosted turn radius to prevent pathing issues - [Wraith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wraith): - Time cost now 28, from 25 - Sight range now 6, from 7 @@ -260,6 +264,10 @@ Patch goals include: - *Requiring more of an investment to make more than one Accantor drop seems appropriate in a world without the "Shuttle Speed" upgrade.* - [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora): - Last Orders damage now 25, from 20 +- [Lanifect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/lanifect): + - HP now 100, from 90 + - Now moves ~10% slower + - *This gives Disruption Field more time to be active in skirmishes, while making repositioning a bit more feasible. The Lanifect should also be a bit more reliable in sorties.* - [Pylon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pylon): - Mineral cost now 75, from 50 - *Protoss players should think a bit more about when and where to add Pylons. This also reduces manner Pylon frequency, without removing it entirely.* @@ -280,6 +288,7 @@ Patch goals include: - *After fixing a bug where the Kalkalisk was dealing double damage to its primary target, this change keeps their damage relatively similar.* - [Mutalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mutalisk): - Gas cost now 75, from 50 + - Armor penetration now 0, from 2 - Now moves ~5% slower - *Keeping an eye on mass Muta...* - [Tosgrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tosgrilisk):