diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3c2cba33..7f3fe862 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 4a201ad3..400f7bed 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 d27b61ca..70e4a9fc 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2386,7 +2386,7 @@ Tortare Tortare Shadow Cybrene Cybrene Shadow -Extended Image #1386 +Silversoul Remains Extended Image #1387 Extended Image #1388 Extended Image #1389 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 91e984d1..1a072cc1 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 cb56a9a7..4add0aa3 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1105,8 +1105,8 @@ Crematorium Paraclete Zethalor Scrylyleth -Thaumalogue Remnants -Zethalor Remnants +Thaumalogue Remains +Zethalor Remains Conduit Bestiary Eyelet @@ -1152,7 +1152,7 @@ Limire Endbore Tortare Cybrene -Extended Sprite #638 +Silversoul Remains Extended Sprite #639 Extended Sprite #640 Extended Sprite #641 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a5795bd8..c0ee1a02 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 ed91c27e..d46a7914 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 76c831b0..1b59c3f5 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 4008f4cc..17c67139 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index e6eb12d2..243f3a9f 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 48c9e1b3..1ecfdec6 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -392,7 +392,7 @@ c<1><4>Raise Constituent <1>(<3>C<1>)<10>Skybound worker.<0> e<3><4>Salvage <1>(<3>E<1>)<10>Orders the builder to deconstruct the target mechanical unit or structure, returning up to 33% of its resource cost during the channel.<0> e<3><4>Rapid Rendezvous <1>(<3>E<1>)<10>Leaps to the target ground ally within 5 range, activating Impact Dissipation for all allies within 3 range of the jump target.<0> c<3><4>Hijack <1>(<3>C<1>)<10>Leaps to the target hostile, attaching to the victim and slowing their movement speed by 50%.<10><10>After 5 seconds, the Askosi combatant becomes the target.<0> -e<3><4>Rematerialize <1>(<3>E<1>)<10>Pulls the target ally within 5 range to the combatant's location, and grants them Impact Dissipation.<0> +e<3><4>Rematerialize <1>(<3>E<1>)<10>Pulls allies within 3 range of the target to the combatant's location, and grants them Impact Dissipation.<0> e<1><4>Mutate into Kalkiir Lake <1>(<3>E<1>)<10>Swarm node. Enables Liiralisks and Kalkalisks.<0> Terran Structure Armor<0> Zerg Structure Carapace<0> @@ -981,7 +981,7 @@ z<1><4>Install Lotiro <1>(<3>Z<1>)<10>Superb mechanized production.<0> Lotiro Requires<10> Conduit AND Bestiary<0> s<1><4>Install Obelisk <1>(<3>S<1>)<10>Superb skybound production.<0> Obelisk Requires<10> Panoply OR Lotiro<0> -<0> +¤<3><4>Spirited Assembly <2>(passive)<10>While mobile, Silversouls cloak allies within 6 range until their next attack.<10>Upon taking fatal damage while mobile, Silversouls embed themselves into the surface, becoming immobile and more heavily-armored. During this time, they apply Impact Dissipation to allies within 8 range.<0> <0> <0> <0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 23e2b0ff..bcd30612 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index d4f0bd69..1c18c687 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -2777,7 +2777,7 @@ AphoristWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 239 Thaumalogue (cm\a\thaumalogue.grp) +# 2255 Thaumalogue (cm\a\thaumalogue.grp) .headerstart IsId 34 Type 21 @@ -2899,7 +2899,7 @@ ThaumalogueDeath: wait 2 playfram 423 wait 2 - lowsprul 236 0 0 # Thaumalogue Remnants (terran\thaumalogue-death.grp) + lowsprul 1107 0 0 # Thaumalogue Remnants (terran\thaumalogue-death.grp) wait 1 end @@ -5356,6 +5356,221 @@ InsurantWalking: playfram 0x60 goto InsurantWalking +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2364 Silversoul (cm\a\silversoul.grp) +.headerstart +IsId 64 +Type 21 +Init SilversoulInit +Death SilversoulDeath +GndAttkInit SilversoulGndAttkInit +AirAttkInit SilversoulGndAttkInit +Unused1 SilversoulUnused1 +GndAttkRpt SilversoulGndAttkRpt +AirAttkRpt SilversoulGndAttkRpt +CastSpell [NONE] +GndAttkToIdle SilversoulGndAttkToIdle +AirAttkToIdle SilversoulGndAttkToIdle +Unused2 [NONE] +Walking SilversoulWalking +WalkingToIdle SilversoulWalkingToIdle +SpecialState1 ObjectSpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SilversoulInit: + imgulnextid 0 0 # Silversoul Shadow (cm\a\silversoul-shadow.grp) +SilversoulWalkingToIdle: + playfram 0x80 +SilversoulLocal00: + wait 63 + randcondjmp 25 SilversoulLocal01 + randcondjmp 128 SilversoulLocal02 + goto SilversoulLocal00 + +SilversoulLocal01: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + randcondjmp 192 SilversoulLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto SilversoulLocal04 + +SilversoulLocal04: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulLocal03: + wait 13 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulLocal02: + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + turnrand 3 + wait 1 + playfram 0xA0 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) + setfldirect 0 + playfram 416 + wait 2 + playfram 417 + wait 2 + playfram 418 + wait 2 + playfram 419 + wait 2 + playfram 420 + wait 2 + playfram 421 + wait 2 + playfram 422 + wait 2 + playfram 423 + wait 2 + lowsprul 1154 0 0 # Silversoul Remnants (terran\silversoul-death.grp) + wait 1 + end + +SilversoulUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1161 1162 + playfram 422 + wait 2 + playfram 421 + wait 2 + playfram 420 + wait 2 + playfram 419 + wait 2 + playfram 418 + wait 2 + playfram 417 + wait 2 + playfram 416 + wait 2 + setfldirect 12 + nobrkcodeend + goto SilversoulWalkingToIdle + +SilversoulGndAttkInit: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 +SilversoulGndAttkRpt: + wait 1 + nobrkcodestart + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 4 + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 4 + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest +SilversoulGndAttkToIdle: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulWalking: + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x140 + move 4 + wait 1 + playfram 0x160 + move 4 + wait 1 + playfram 0x180 + move 4 + wait 1 + playfram 0x80 + goto SilversoulWalking + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: .headerstart diff --git a/mpq/unit/cm/a/silversoul-attack.lol b/mpq/unit/cm/a/silversoul-attack.lol new file mode 100644 index 00000000..7719b777 Binary files /dev/null and b/mpq/unit/cm/a/silversoul-attack.lol differ diff --git a/mpq/unit/cm/a/silversoul-remains.grp b/mpq/unit/cm/a/silversoul-remains.grp new file mode 100644 index 00000000..df630496 Binary files /dev/null and b/mpq/unit/cm/a/silversoul-remains.grp differ diff --git a/mpq/unit/cm/a/silversoul-shadow.grp b/mpq/unit/cm/a/silversoul-shadow.grp new file mode 100644 index 00000000..cc08bc5c Binary files /dev/null and b/mpq/unit/cm/a/silversoul-shadow.grp differ diff --git a/mpq/unit/cm/a/silversoul.grp b/mpq/unit/cm/a/silversoul.grp new file mode 100644 index 00000000..c2e3af72 Binary files /dev/null and b/mpq/unit/cm/a/silversoul.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 4778686c..30613f64 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 94606103..a6bd4828 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 c7f790f6..021b11bb 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -20,9 +20,11 @@ ## Bugfixes - **Gameplay:** + - Fixed **Zonguard** not applying Booming Blast with Preylock (r. shopkeeper dog) - Fixed various mnemonic hotkey conflicts for Askosi structures (r. Neblime) - Adjusted regeneration code so rare combinations of status effects scale expectedly (c. Veeq7) - - Please report any regeneration oddities that you discover! +- **Audiovisuals** + - Corrected **Thaumalogue** corpse graphic ## Audiovisuals - New SFX for: @@ -39,6 +41,13 @@ - Vision range 10 » 9 ## Askosi +- **Rematerialize:** + - *Used by: Eyelet (Proselyte), Vicar, Emissary* + - Now pulls allies within 3 range of the target unit +- [Proselyte](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/proselyte): + - HP 65 » 80 + - **Dispatch Pistols:** + - Armor penetration 1 » 3 - [Cardinal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cardinal): - Resource costs 75/50 » 75/25 - [Mimic](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/mimic): @@ -60,6 +69,11 @@ - Resource costs 150/100 » 150/75 - [Crematorium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/crematorium): - HP 200 » 300 +- [Landlock](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/landlock): + - Resource costs 300/0 250/0 + - HP 1400 » 1250 +- [Chantry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/chantry): + - Build time 35 » 45 - [Bounty](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bounty): - HP 1200 » 800 - Armor 4 » 3 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f8b54d95..d7f74fb6 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ