diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d5fa0fc2..b1484636 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index d36dccbd..5ac40686 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 94af8263..f4f3b59b 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 925190ad..40b2e14f 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -28089,7 +28089,7 @@ GndAttkToIdle AtreusGndAttkToIdle AirAttkToIdle AtreusGndAttkToIdle Unused2 [NONE] Walking AtreusWalking -WalkingToIdle AtreusWalkingToIdle +WalkingToIdle AtreusGndAttkToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -28104,60 +28104,11 @@ WarpIn AtreusWarpIn AtreusInit: imgul 1173 0 0 # Atreus Shadow (cm\protoss\atreus-shad.grp) - playfram 0x00 - wait 2 -AtreusLocal00: - wait 62 - randcondjmp 25 AtreusLocal01 - randcondjmp 13 AtreusLocal02 - goto AtreusLocal00 - -AtreusLocal01: - playfram 0x11 - wait 1 - playfram 0x22 - wait 1 - playfram 0x33 - wait 1 - playfram 0x44 - waitrand 8 15 - playfram 0x33 - wait 1 - playfram 0x22 - wait 1 - randcondjmp 43 AtreusLocal01 - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - randcondjmp 13 AtreusLocal02 - goto AtreusLocal00 - -AtreusLocal02: - playfram 0x55 - wait 1 - playfram 0x66 - wait 1 - playfram 0x77 - wait 1 - playfram 0x88 - waitrand 8 15 - playfram 0x77 - wait 1 - playfram 0x66 - wait 1 - randcondjmp 43 AtreusLocal02 - playfram 0x55 - wait 1 - playfram 0x00 - wait 1 - randcondjmp 13 AtreusLocal01 - goto AtreusLocal00 + goto AtreusGndAttkToIdle AtreusGndAttkToIdle: playfram 0x00 - wait 2 - goto AtreusLocal00 + goto ScourgeLocal00 AtreusDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV @@ -28172,14 +28123,10 @@ AtreusGndAttkInit: AtreusGndAttkRpt: wait 1 nobrkcodestart - playfram 0x1A9 + playfram 0x220 playsndbtwn 1788 1790 # Atreus weapon fire 01, 02, 03 attackwith 1 wait 1 - playfram 0x1BA - wait 1 - playfram 0x1CB - wait 1 playfram 0x00 wait 1 nobrkcodeend @@ -28190,61 +28137,57 @@ AtreusGndAttkRpt: AtreusWalking: move 4 wait 1 - playfram 0xcc + playfram 0x20 move 4 wait 1 - playfram 0xdd + playfram 0x40 move 4 wait 1 - playfram 0xee + playfram 0x60 move 4 wait 1 - playfram 0xff + playfram 0x80 move 4 wait 1 - playfram 0x110 + playfram 0xA0 move 4 wait 1 - playfram 0x121 + playfram 0xC0 move 4 wait 1 - playfram 0x132 + playfram 0xE0 move 4 wait 1 - playfram 0x143 + playfram 0x100 move 4 wait 1 - playfram 0x154 + playfram 0x120 move 4 wait 1 - playfram 0x165 + playfram 0x140 move 4 wait 1 - playfram 0x176 + playfram 0x160 move 4 wait 1 - playfram 0x187 + playfram 0x180 move 4 wait 1 - playfram 0x198 + playfram 0x1A0 move 4 wait 1 - playfram 0x99 + playfram 0x1C0 move 4 wait 1 - playfram 0xaa + playfram 0x1E0 move 4 wait 1 - playfram 0xbb + playfram 0x200 goto AtreusWalking -AtreusWalkingToIdle: - playfram 0x00 - goto AtreusLocal00 - AtreusWarpIn: imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto AtreusLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/protoss/atreus-shadow.grp b/mpq/unit/cm/protoss/atreus-shadow.grp index ce34a183..a9c487e7 100644 Binary files a/mpq/unit/cm/protoss/atreus-shadow.grp and b/mpq/unit/cm/protoss/atreus-shadow.grp differ diff --git a/mpq/unit/cm/protoss/atreus.grp b/mpq/unit/cm/protoss/atreus.grp index 5b0881ae..688d4de6 100644 Binary files a/mpq/unit/cm/protoss/atreus.grp and b/mpq/unit/cm/protoss/atreus.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 5a12295e..b0bdc788 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 92e508f3..2c655030 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index 26bb3324..ee7e3a11 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -33,8 +33,9 @@ Forthcoming. - Restored Clarion Phase Link functionality (r. Neblime, c. Veeq7) - Restored Magnetar Yamato Cannon functionality (r. jakulangski) - Anthelion Gravity Well can no longer stun victims (r. GreenEggs'NSpam) - - Fixed issues with building modifiers (e.g. Debug game mode and Crucible) (c. Veeq7) - Cancelling Dimensional Recall can no longer be exploited to recall units from another location + - Phase Link no longer overcounts armor, miscounts damage, or spreads minimal damage incorrectly (c. Veeq7) + - Fixed issues with building modifiers (e.g. Debug game mode and Crucible) (c. Veeq7) - Kalkalisks now properly regress to Nathrokors, if applicable (r. jakulangski) - Combat cloak is now correctly cancelled by Magnetar Law of Attraction - Anthelions no longer attempt to flee cloaked targets @@ -109,6 +110,9 @@ Forthcoming. - **Galactic Weaver:** - Armor penetration 5 » 0 - Weapon cooldown 0.5 » 0.67 +- [Clarion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/clarion): + - **Phase Link:** + - Damage spread 50% » 75% - [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora): - **Last Orders** can now target air units - [Anthelion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/anthelion): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 40774c3c..bc1f9fa6 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ