diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index c93a6768..cff6a732 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 7ef84034..0e89270b 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -493,7 +493,7 @@ Sevenstep Projectile Omnivale Lodestone Ocsal Cesiant -Extended Flingy #287 +Potentate Extended Flingy #288 Extended Flingy #289 Extended Flingy #290 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 209f42af..6a0f5569 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 067cb8f1..bb37786b 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 d29cd4a3..6c6f2144 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1762,8 +1762,8 @@ Lodestone Overlay Lodestone Shadow Ocsal Cesiant Ocsal Cesiant Shadow -Extended Image #762 -Extended Image #763 +Potentate +Potentate Shadow Extended Image #764 Extended Image #765 Extended Image #766 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 2b503651..6cb30481 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 02c15733..ad447ce7 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -881,7 +881,7 @@ Quazilisk (April Fools) Omnivale Lodestone Ocsal Cesiant -Extended Sprite #1 +Potentate Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index e470c4fb..cd884eb0 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 44b5e160..f39ebc34 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -383,7 +383,7 @@ Terran Madrigal (Furia Mode) Madrigal Turret (Furia) Omnivale Terran Lodestone -Extended Unit #158 +Floor Hatch Extended Unit #159 Extended Unit #160 Extended Unit #161 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 888eb076..cea3e90f 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index c631dd6d..93378b74 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -131,7 +131,7 @@ Hammerfall Beacon (Diadem) None Icarus Missiles (Luminary) Litany Cannons (Epigraph) -Phase Saber (Striga) +Projection Saber (Striga) Searing Venom (Axitrilisk) Hedon Cannon (Tarasque) Accelerated Plasmid (Tarasque) @@ -204,8 +204,8 @@ Cylindrical Blaster (Analogue) Heirloom Batteries (Philoc) Nathrok Claws (Nathrokor) Calcification (Gorgrokor) -Extended Weapon #77 -Extended Weapon #78 +Talismanic Weaver (Potentate) +Phase Saber (Potentate) Extended Weapon #79 Extended Weapon #80 Extended Weapon #81 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 3698401f..65b5bad4 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 86e64813..10244d98 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index cd012724..c23a9c7c 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 78421173..d88148b0 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -29862,7 +29862,7 @@ AmaranthGndAttkRpt: playfram 0x44 wait 1 playfram 0x55 - playsndbtwn 1231 1234 + playsndbtwn 1231 1234 # Amaranth weaponfire 01, 02, 03, 04 attackmelee 1 664 # Protoss\ZEALOT\pzeHit00.WAV wait 1 playfram 0x66 @@ -52093,4 +52093,154 @@ OmnivaleIsWorking: wait 1 goto OmnivaleIsWorking -# Next free isid: 759 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1170 Potentate (cm\protoss\potentate.grp) +.headerstart +IsId 759 +Type 21 +Init PotentateInit +Death PotentateDeath +GndAttkInit PotentateGndAttkInit +AirAttkInit PotentateGndAttkInit +Unused1 PotentateUnused1 +GndAttkRpt PotentateGndAttkRpt +AirAttkRpt PotentateGndAttkRpt +CastSpell [NONE] +GndAttkToIdle PotentateGndAttkToIdle +AirAttkToIdle PotentateGndAttkToIdle +Unused2 [NONE] +Walking PotentateWalking +WalkingToIdle PotentateWalkingToIdle +SpecialState1 PotentateMeleeAttkRpt +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn PotentateWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +PotentateInit: + imgul 1172 0 0 # Potentate Shadow (cm\protoss\potentate-shad.grp) + playfram 0x00 + wait 2 + goto PotentateLocal69 + +PotentateLocal42: + playfram 0x00 + goto PotentateLocal69 + +PotentateLocal69: + wait 125 + goto PotentateLocal69 + +PotentateGndAttkToIdle: + playfram 0x180 + wait 1 + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 1 + goto PotentateLocal69 + +PotentateDeath: + playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV + imgol 153 0 0 # Zealot Death (protoss\zealot.grp) + wait 3 + lowsprul 818 0 0 # Potentate Remains + end + +PotentateUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1186 # Cantavis revive 01 + imgol 1445 0 0 # Zealot death reversed + wait 12 + setfldirect 12 + nobrkcodeend + goto PotentateLocal42 + +PotentateGndAttkInit: + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + sigorder 32 + goto PotentateGndAttkRpt +PotentateGndAttkRpt: + wait 1 + nobrkcodestart + playsndbtwn 1362 1366 # Potentate attack 01, 02, 03, 04, 05 + attackwith 2 + playfram 0x1A0 + wait 1 + playfram 0x180 + wait 1 + sigorder 32 + nobrkcodeend + gotorepeatattk + ignorerest + goto PotentateGndAttkToIdle + +PotentateMeleeAttkRpt: + wait 1 + nobrkcodestart + playsndbtwn 1231 1234 # Amaranth weaponfire 01, 02, 03, 04 + attackmelee 1 664 # Protoss\ZEALOT\pzeHit00.WAV + playfram 0x1A0 + wait 1 + playfram 0x180 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto PotentateGndAttkToIdle + +PotentateWalking: + move 5 + wait 1 + playfram 0x100 + move 5 + wait 1 + playfram 0x20 + move 5 + wait 1 + playfram 0x40 + move 5 + wait 1 + playfram 0x60 + move 5 + wait 1 + playfram 0x80 + move 5 + wait 1 + playfram 0xA0 + move 5 + wait 1 + playfram 0xC0 + move 5 + wait 1 + playfram 0xE0 + goto PotentateWalking + +PotentateWalkingToIdle: + playfram 0x00 + goto PotentateLocal69 + +PotentateWarpIn: + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) + goto InfestedTerranLocal00 + +# Next free isid: 760 \ No newline at end of file diff --git a/mpq/unit/cm/protoss/potentate-shadow.grp b/mpq/unit/cm/protoss/potentate-shadow.grp new file mode 100644 index 00000000..30dc626e Binary files /dev/null and b/mpq/unit/cm/protoss/potentate-shadow.grp differ diff --git a/mpq/unit/cm/protoss/potentate.grp b/mpq/unit/cm/protoss/potentate.grp new file mode 100644 index 00000000..3a10eb61 Binary files /dev/null and b/mpq/unit/cm/protoss/potentate.grp differ diff --git a/mpq/unit/cm/zerg/larvalcolony-damage.lof b/mpq/unit/cm/zerg/larvosk-cesiant-damage.lof similarity index 100% rename from mpq/unit/cm/zerg/larvalcolony-damage.lof rename to mpq/unit/cm/zerg/larvosk-cesiant-damage.lof diff --git a/mpq/unit/cm/zerg/larvalcolony-shadow.grp b/mpq/unit/cm/zerg/larvosk-cesiant-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/larvalcolony-shadow.grp rename to mpq/unit/cm/zerg/larvosk-cesiant-shadow.grp diff --git a/mpq/unit/cm/zerg/larvalcolony.grp b/mpq/unit/cm/zerg/larvosk-cesiant.grp similarity index 100% rename from mpq/unit/cm/zerg/larvalcolony.grp rename to mpq/unit/cm/zerg/larvosk-cesiant.grp diff --git a/mpq/unit/cm/zerg/ocsal-cesiant-damage.lof b/mpq/unit/cm/zerg/ocsal-cesiant-damage.lof new file mode 100644 index 00000000..e676c29a Binary files /dev/null and b/mpq/unit/cm/zerg/ocsal-cesiant-damage.lof differ diff --git a/mpq/unit/cm/zerg/ocsal-cesiant-shadow.grp b/mpq/unit/cm/zerg/ocsal-cesiant-shadow.grp new file mode 100644 index 00000000..71b2f00e Binary files /dev/null and b/mpq/unit/cm/zerg/ocsal-cesiant-shadow.grp differ diff --git a/mpq/unit/cm/zerg/ocsal-cesiant.grp b/mpq/unit/cm/zerg/ocsal-cesiant.grp new file mode 100644 index 00000000..8fe9dfeb Binary files /dev/null and b/mpq/unit/cm/zerg/ocsal-cesiant.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 47dca6e3..72a3548f 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 18e87a3e..bb28470b 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 8010ab2c..ac1bd49d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -20,7 +20,14 @@ Patch goals include: - Fixed a crash related to Demiurges (r. benno & The Shambler, c. DF) - Gameplay: - Sycophants no longer "donate" shields for free (r. Mystery Meat) + - Ascending corpses now enchants allies instead of enemies - Cagra spread by Omnivales now correctly recedes when the Omnivale dies (r. Btyb88) +- Audiovisual: + - Ocsal Cesiant now has a wireframe + +## Audiovisuals +- Updated sprite for: + - Ocsal Cesiant (placeholder) ## Protoss - [Sycophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/sycophant): @@ -55,4 +62,16 @@ Patch goals include: - Time cost now 70, from 60 - HP now 850, from 750 - [Argosy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/argosy): - - Time cost now 60, from 50 \ No newline at end of file + - Time cost now 60, from 50 +- **NEW:** [Potentate](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/potentate): + - Flexible supportive ranger; trained from Prostration Stage + +## Zerg +- [Mortothrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mortothrokor): + - Now moves ~7.5% faster + - Whetted Appetite: + - Now increases lifesteal + - No longer increases movement speed +- [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk): + - Now moves ~22% faster + - Weapon range now 8, from 10 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index d23c612b..4828a2ff 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ