diff --git a/CMBW-editor/brush/Cosmonarchy-jungle.scmdbrh b/CMBW-editor/brush/Cosmonarchy-jungle.scmdbrh index 8feb5238..15a70c99 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-jungle.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-jungle.scmdbrh differ diff --git a/CMBW-editor/brush/Cosmonarchy-platform.scmdbrh b/CMBW-editor/brush/Cosmonarchy-platform.scmdbrh index 2a744b94..6a886138 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-platform.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-platform.scmdbrh differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index dc523a90..89d45e9d 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 b7fa0307..ea4d69e7 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -470,8 +470,8 @@ Empress Plasma Engram Hammerfall Beacon Zarcavrokor Bone -Extended Flingy #264 -Extended Flingy #265 +Cyprian Rail +Sentinel Rail Extended Flingy #266 Extended Flingy #267 Extended Flingy #268 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 2d44c521..3453c0a9 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 dcf2bbac..cc7379ea 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 5665499d..4e9dbc57 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1716,8 +1716,8 @@ Engram Engram Shadow Hammerfall Beacon Zarcavrokor Bone -Extended Image #716 -Extended Image #717 +Cyprian Rail +Sentinel Rail Extended Image #718 Extended Image #719 Extended Image #720 diff --git a/mpq/arr/orders.txt b/mpq/arr/orders.txt index deea6d48..e0292321 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -153,7 +153,7 @@ Reset Collision (Harvester&Mine) Patrol (Normal) CTF COP (Initialize) Blissful Embrace (Akistrokor) -Unknown CTF COP 2 +Grief of All Gods (Star Sovereign) Script (Computer) Attack Move (Computer) Move (Harass) diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 53dcbf4c..a5d7fb0e 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 c7cffc14..7f05af4b 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -852,8 +852,8 @@ Zerg Unit Rubble (Tiny) Engram Hammerfall Beacon Zarcavrokor Bone -Extended Sprite #1 -Extended Sprite #1 +Cyprian Rail +Sentinel Rail Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 4bdd17ae..8fe0847e 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 63910bc5..df2f4515 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 2c5a02b1..d46b89bd 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 f93f5681..77057833 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -22667,21 +22667,21 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # HaloRocketInit: - playfram 0x00 # Frame set 0 - playsnd 1023 # Bullet\Tfrshoot.wav - wait 1 - sigorder 1 - wait 1 + playfram 0x00 + playsnd 1023 # Bullet\Tfrshoot.wav + wait 1 + sigorder 1 + wait 1 HaloRocketGndAttkInit: sprol 505 0 0 # Halo Rockets Trail (thingy\bsmoke.grp) wait 2 goto HaloRocketGndAttkInit HaloRocketDeath: - playsnd 1022 # Bullet\Tfrhit.wav - imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) + playsnd 1022 # Bullet\Tfrhit.wav + imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) domissiledmg - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -22698,29 +22698,29 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # OpticalFlareInit: - playfram 0x00 # Frame set 0 - playsnd 1016 # Terran\Medic\TMedflsh.wav - wait 1 - sigorder 1 - wait 1 + playfram 0x00 + playsnd 1016 # Terran\Medic\TMedflsh.wav + wait 1 + sigorder 1 + wait 1 OpticalFlareGndAttkInit: - sprol 310 0 0 # Grenade Shot Smoke (thingy\GreSmoke.grp) - wait 1 + sprol 310 0 0 # Grenade Shot Smoke (thingy\GreSmoke.grp) + wait 1 OpticalFlareLocal00: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 goto OpticalFlareLocal00 OpticalFlareDeath: - imgol 977 0 0 # Optical Flare Hit (Medium) (thingy\TmeFlshM.grp) + imgol 977 0 0 # Optical Flare Hit (Medium) (thingy\TmeFlshM.grp) domissiledmg - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -29640,9 +29640,9 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # SalamanderMissileInit: - playfram 0x00 # Frame set 0 - wait 1 - sigorder 1 + playfram 0x00 + wait 1 + sigorder 1 goto SalamanderMissileGndAttkInit SalamanderMissileGndAttkInit: @@ -51967,4 +51967,40 @@ ZarcavrokorBoneDeath: sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1718 Cyprian Rail (cm\terran\cyprian-rail.grp) +.headerstart +IsId 733 +Type 2 +Init OmniBulletOneInit +Death OmniBulletOneDeath +GndAttkInit OmniBulletOneGndAttkInit +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +OmniBulletOneInit: + playfram 0x00 + wait 1 + sigorder 1 + wait 1 +OmniBulletOneGndAttkInit: + playfram 0x00 + wait 125 + goto OmniBulletOneGndAttkInit + +OmniBulletOneDeath: + if bullet.weapon_id == 147 goto OmniBulletOneBlueDeath + imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) + domissiledmg + wait 1 + end + +OmniBulletOneBlueDeath: + imgol 1249 0 0 # Burst Lasers Blue Impact (thingy\elbHit.grp) + domissiledmg + wait 1 end \ No newline at end of file diff --git a/mpq/unit/cm/protoss/engram.grp b/mpq/unit/cm/protoss/engram.grp index 74d97919..94fabe1e 100644 Binary files a/mpq/unit/cm/protoss/engram.grp and b/mpq/unit/cm/protoss/engram.grp differ diff --git a/mpq/unit/cm/terran/cyprian-attack.lol b/mpq/unit/cm/terran/cyprian-attack.lol new file mode 100644 index 00000000..0e092820 Binary files /dev/null and b/mpq/unit/cm/terran/cyprian-attack.lol differ diff --git a/mpq/unit/cm/terran/cyprian-rail.grp b/mpq/unit/cm/terran/cyprian-rail.grp new file mode 100644 index 00000000..6d4ff5ca Binary files /dev/null and b/mpq/unit/cm/terran/cyprian-rail.grp differ diff --git a/mpq/unit/cm/terran/sentinel-rail.grp b/mpq/unit/cm/terran/sentinel-rail.grp new file mode 100644 index 00000000..12421c0e Binary files /dev/null and b/mpq/unit/cm/terran/sentinel-rail.grp differ diff --git a/patchnotes.md b/patchnotes.md index 9357bcd3..374e7898 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,91 +1,7 @@ -# 9 April 2023 - prospective patch notes +# 15 April 2023 - prospective patch notes ## Designer's Notes -Continuing March Madness into April, tweaking the economic pacing some more, and improving AI - plus plenty of bugfixes and unit revisions! - -## Resources -- Harvest time now 4 seconds, from 4.8 -- Worker movement speeds now 10% faster -- Worker wandering now works more consistently -- You can now return resources to an allied town center (note that your ally receives none of the returned resources) -- You can now harvest vespene gas from an allied refinery +We will revise reclamation (and other corpse interactions), as well as Vulture mine-laying. Stay tuned! ## Gameplay -- Burrowed units are no longer forcibly unburrowed when attacked (c. DarkenedFantasies) -- Masons (and Taloses) now return to the point where they began construction, to avoid Masons getting stuck behind capped Geysers and similar silliness (c. DarkenedFantasies) -- During construction, Masons and Taloses now move in a predictable pattern* (c. DarkenedFantasies) -- Sieged Phalanxes and burrowed Lakizilisks are no longer killed by landing structures - -## Bugfixes -- Maelstrom hits from dead Mind Tyrants no longer crash (c. Veeq7) -- Cancelling Controlled Demolition no longer desyncs -- Internal handling of many new abilities has been restructured to be less error-prone (c. Veeq7) -- Basic workers should no longer freeze in place (c. DarkenedFantasies) -- Attack-move no longer causes units to ignores enemies when initially attacking a structure -- Weapons with Prolonged Arms now pierce targets far more consistently (c. Veeq7) -- Zarcavrokor Bones of Reflection now correctly respects weapon range (c. Veeq7) -- Star Sovereigns no longer turn wildly when trying to cast Grief of All Gods while accelerating (c. Veeq7) -- Burrowed units are no longer displaced by Striga Fleeting Focus, Magnetar Law of Attraction (c. Pr0nogo), or Anthelion Gravity Well (c. Veeq7) -- Player color randomization now ignores the colors of witness players (c. Veeq7) -- Anthelion weapon fire SFX no longer occasionally fails to play -- Madrigal weapon range is now displayed correctly when tempo is up (c. Veeq7) -- Missile Silo stats display is no longer wucked while arming missiles (c. Veeq7) - -## UI -- Box selections are now sorted more consistently (c. Veeq7) -- Centering onto control groups when members are far apart has been improved (c. Veeq7) -- Minimap unit box update rate is now instant (c. DarkenedFantasies) -- Witnesses are no longer shown in the score screen (c. DarkenedFantasies) -- A new config option for hiding replay progress bars is now available (c. DarkenedFantasies) - -## AI -- Attack logic and mid-game production handling have been cleaned up to be more sensible with the current economic state -- AI "drip-feed" attack waves less often -- Zerg AI now request advanced defenses when at tier 2 and beyond - -## Audiovisuals -- New sprite for: - - Cyprian Twin Railguns projectiles - - Sentinel Cerberus Railgun projectile - - Cabalist shadow - - Zarcavrokor Bones of Reflection projectile -- Modified sprite for: - - Scribe (adjust back fins) - -## Terran -- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian): - - Weapon factor and damage now 2x5, from 1x10 - - Weapon now travels to maximum range, and no longer splashes - - Now benefits from Prolonged Arms, piercing all targets as it travels -- [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles): - - HP now 140, from 120 - - Armor now 4, from 3 - - Weapon damage now 2x14, from 2x10 - - Armor penetration now 0, from 4 - - Nemean Reactors removed -- [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle): - - Gas cost now 150, from 125 - - Last Breath removed -- [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury): - - Time cost now 50, from 45 -- [Sentinel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sentinel): - - Mineral cost now 250, from 225 - - Weapon can no longer target air units -- [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon): - - Mineral cost now 1000, from 800 - - Weapon cooldown now 7, from 10 (revert of previous change) - - Now fires a Hammerfall Beacon at target's initial position, before firing main gun at beacon position - -## Protoss -- [Cantavis](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cantavis): - - Max energy now 150, from 200 -- [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan): - - Gas cost now 150, from 175 -- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): - - Splash type now ally-safe, from unsafe -- [Panoptus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/panoptus): - - Acceleration and halt distance now match the Aurora - -## Zerg -- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): - - Armor now 2, from 1 \ No newline at end of file +- During construction, Masons and Taloses now move in a predictable pattern* (c. DarkenedFantasies) \ No newline at end of file diff --git a/plugins/aise.qdp b/plugins/aise.qdp index 460a6a1e..6f32293a 100644 Binary files a/plugins/aise.qdp and b/plugins/aise.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 14e76085..b11af8f0 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ