diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index ae52e74b..960f31df 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 8fd09871..7fc8a181 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 d4cc12c4..f407269b 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1853,7 +1853,7 @@ Grand Library Grand Library Shadow Grand Library Warp Flash Gladius Charge -Extended Image #853 +Optecton Muzzle Flash Extended Image #854 Extended Image #855 Extended Image #856 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index 09918962..32aec61d 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl index 32afd876..a3bf324b 100644 Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index b600fe80..b9183dcb 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -179,7 +179,7 @@ Cikralisk Kagralisk Hypnagogue Apostle -Extended Portrait #72 +Pythean Extended Portrait #73 Extended Portrait #74 Extended Portrait #75 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 72d75201..96652443 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index cc8b7749..92be0092 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 bfd69be7..699e4d26 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index cf876867..98c74de8 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/terran/pythean/fid00.smk b/mpq/portrait/terran/pythean/fid00.smk new file mode 100644 index 00000000..74f8f347 Binary files /dev/null and b/mpq/portrait/terran/pythean/fid00.smk differ diff --git a/mpq/portrait/terran/pythean/fid01.smk b/mpq/portrait/terran/pythean/fid01.smk new file mode 100644 index 00000000..04314c72 Binary files /dev/null and b/mpq/portrait/terran/pythean/fid01.smk differ diff --git a/mpq/portrait/terran/pythean/fid02.smk b/mpq/portrait/terran/pythean/fid02.smk new file mode 100644 index 00000000..14dc84f7 Binary files /dev/null and b/mpq/portrait/terran/pythean/fid02.smk differ diff --git a/mpq/portrait/terran/pythean/fid03.smk b/mpq/portrait/terran/pythean/fid03.smk new file mode 100644 index 00000000..2632edc3 Binary files /dev/null and b/mpq/portrait/terran/pythean/fid03.smk differ diff --git a/mpq/portrait/terran/pythean/tlk00.smk b/mpq/portrait/terran/pythean/tlk00.smk new file mode 100644 index 00000000..992da1a0 Binary files /dev/null and b/mpq/portrait/terran/pythean/tlk00.smk differ diff --git a/mpq/portrait/terran/pythean/tlk01.smk b/mpq/portrait/terran/pythean/tlk01.smk new file mode 100644 index 00000000..ca63bfc5 Binary files /dev/null and b/mpq/portrait/terran/pythean/tlk01.smk differ diff --git a/mpq/portrait/terran/pythean/tlk02.smk b/mpq/portrait/terran/pythean/tlk02.smk new file mode 100644 index 00000000..005fd71d Binary files /dev/null and b/mpq/portrait/terran/pythean/tlk02.smk differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index b384e037..8e201e6a 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -47830,58 +47830,12 @@ OptectonInit: imgul 1625 0 0 # Optecton Shadow (cm\protoss\optecton-shad.grp) playfram 0x00 wait 2 -OptectonLocal00: - wait 62 - randcondjmp 25 OptectonLocal01 - randcondjmp 13 OptectonLocal02 - goto OptectonLocal00 - -OptectonLocal01: - 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 OptectonLocal01 - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - randcondjmp 13 OptectonLocal02 - goto OptectonLocal00 - -OptectonLocal02: - 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 OptectonLocal02 - playfram 0x55 - wait 1 - playfram 0x00 - wait 1 - randcondjmp 13 OptectonLocal01 - goto OptectonLocal00 + goto ScourgeLocal00 OptectonGndAttkToIdle: playfram 0x00 wait 2 - goto OptectonLocal00 + goto ScourgeLocal00 OptectonDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV @@ -47896,13 +47850,15 @@ OptectonGndAttkInit: OptectonGndAttkRpt: wait 1 nobrkcodestart - playfram 0x1A9 + wait 1 + playfram 0x220 + imgoluselo 1855 0 0 # Optecton muzzle flash playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 attackwith 1 wait 1 - playfram 0x1BA + playfram 0x240 wait 1 - playfram 0x1CB + playfram 0x260 wait 1 playfram 0x00 wait 1 @@ -47914,61 +47870,61 @@ OptectonGndAttkRpt: OptectonWalking: 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 OptectonWalking OptectonWalkingToIdle: playfram 0x00 - goto OptectonLocal00 + goto ScourgeLocal00 OptectonWarpIn: imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto OptectonLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51088,5 +51044,21 @@ GladiusChargeDeath: playfram 3 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1855 Optecton Muzzle Flash (cm\protoss\optecton-muzzle.grp) +.headerstart +IsId 780 +Type 1 +Init MuzzleFlashSingleInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +MuzzleFlashSingleInit: + playfram 0x00 + wait 1 + end -## Next free IsId: 780 \ No newline at end of file +## Next free IsId: 781 \ No newline at end of file diff --git a/mpq/unit/cm/protoss/hierophant-shadow.grp b/mpq/unit/cm/protoss/hierophant-shadow.grp index 1bc3ecfe..ca56ebc3 100644 Binary files a/mpq/unit/cm/protoss/hierophant-shadow.grp and b/mpq/unit/cm/protoss/hierophant-shadow.grp differ diff --git a/mpq/unit/cm/protoss/hierophant.grp b/mpq/unit/cm/protoss/hierophant.grp index 83eab4b0..16582218 100644 Binary files a/mpq/unit/cm/protoss/hierophant.grp and b/mpq/unit/cm/protoss/hierophant.grp differ diff --git a/mpq/unit/cm/protoss/optecton-attack.lol b/mpq/unit/cm/protoss/optecton-attack.lol index 5d7c5e1f..88f9a836 100644 Binary files a/mpq/unit/cm/protoss/optecton-attack.lol and b/mpq/unit/cm/protoss/optecton-attack.lol differ diff --git a/mpq/unit/cm/protoss/optecton-muzzle.grp b/mpq/unit/cm/protoss/optecton-muzzle.grp new file mode 100644 index 00000000..9367fb17 Binary files /dev/null and b/mpq/unit/cm/protoss/optecton-muzzle.grp differ diff --git a/mpq/unit/cm/protoss/optecton-shadow.grp b/mpq/unit/cm/protoss/optecton-shadow.grp index ce34a183..ac2bab76 100644 Binary files a/mpq/unit/cm/protoss/optecton-shadow.grp and b/mpq/unit/cm/protoss/optecton-shadow.grp differ diff --git a/mpq/unit/cm/protoss/optecton.grp b/mpq/unit/cm/protoss/optecton.grp index 28496fcc..5bbaad9b 100644 Binary files a/mpq/unit/cm/protoss/optecton.grp and b/mpq/unit/cm/protoss/optecton.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index d5acdd61..be41f51e 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 df6fb18e..d939e67c 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 3e496de0..87419f71 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 80568149..793d9125 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 87c17106..28e2af85 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -35,11 +35,15 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues - Restored 'Set Next Scenario' trigger action functionality ## Audiovisuals +- Replaced sprites for: + - Hierophant (c. Baelethal) + - Optecton - Added reads for: - Maverick Stimpack (inject, proc, expire) - Savant form switch - Madcap Cabeirus Feeders achieving full stacks - Gladius Binding Plasma charge (visuals) and proc (audio) +- Added portrait for Pythean (c. jun3hong) - Advisors: - Replaced default Zerg advisor - Achieved custom advisor support for: @@ -71,6 +75,12 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues ## Protoss - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): - Sight range now 6, from 7 +- [Pariah](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pariah): + - Now blocks titanic movement (e.g. Penumbra, Optecton) +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - Collision size now significantly larger + - No longer collides with small units + - Now moves ~14% faster - [Gateway](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gateway): - Armor now 3, from 4 - [Grand Library](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/grand-library): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 17255b27..66247e0f 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ