diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 60938a99..628d47af 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 7c6c6457..03e02f75 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -735,8 +735,8 @@ Ifrit (Tank Mode) Ifrit Turret (Tank Mode) Ifrit (Siege Mode) Ifrit Turret (Siege Mode) -Extended Flingy #529 -Extended Flingy #530 +Tirade (Deployed) +Magian Extended Flingy #531 Extended Flingy #532 Extended Flingy #533 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index bc1bcce4..3d6a1b09 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 e933ba07..bbbc525e 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 ebd90b3e..c5edd733 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2524,10 +2524,10 @@ Ifrit (Tank Mode) Turret Ifrit (Siege Mode) Ifrit (Siege Mode) Shadow Ifrit (Siege Mode) Turret -Extended Image #1524 -Extended Image #1525 -Extended Image #1526 -Extended Image #1527 +Tirade Engines +Tirade Deployed +Magian +Magian Shadow Extended Image #1528 Extended Image #1529 Extended Image #1530 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index b8e20536..e726dcb4 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/orders.txt b/mpq/arr/orders.txt index 880265aa..cf5f2829 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -187,7 +187,7 @@ Use Ability (Aural Assault) Use Ability (Maelstrom) Move (Junk Yard Dog) Fatal -Extended Order #1 +Use Ability (Landfall) Extended Order #2 Extended Order #3 Extended Order #4 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index be79ab2c..db196bb3 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 07d27932..c7b828cb 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 60537178..03fefc0a 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -334,7 +334,7 @@ Dredge Ixodid Camazotz Cannibal -Extended Portrait #227 +Hammer Extended Portrait #228 Extended Portrait #229 Extended Portrait #230 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index c558e099..73997636 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 9d477e3a..6f4b4870 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4479,46 +4479,46 @@ Shaman Upstart Weaponfire 02 Arquebus Weaponfire 01 Arquebus Weaponfire 02 Arquebus Weaponfire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Vestige Weaponfire 01 +Vestige Weaponfire 02 +Vestige Weaponfire 03 +Othstoleth Death 01 +Othstoleth Ready 01 +Othstoleth Selected 01 +Othstoleth Selected 02 +Othstoleth Selected 03 +Othstoleth Selected 04 +Othstoleth Order Passive 01 +Othstoleth Order Passive 02 +Othstoleth Order Passive 03 +Othstoleth Order Passive 04 +Othstoleth Under Attack 01 +Othstoleth Under Attack 02 +Othstoleth Under Attack 03 +Tosgrilisk Death 01 +Tosgrilisk Ready 01 +Tosgrilisk Selected 01 +Tosgrilisk Selected 02 +Tosgrilisk Selected 03 +Tosgrilisk Selected 04 +Tosgrilisk Order Passive 01 +Tosgrilisk Order Passive 02 +Tosgrilisk Order Passive 03 +Tosgrilisk Order Passive 04 +Tosgrilisk Under Attack 01 +Tosgrilisk Under Attack 02 +Tosgrilisk Under Attack 03 +Tosgrilisk Under Attack 04 +Bactalisk Ready 01 +Bactalisk Selected 01 +Bactalisk Selected 02 +Bactalisk Selected 03 +Bactalisk Order Passive 01 +Bactalisk Order Passive 02 +Bactalisk Order Passive 03 +Bactalisk Order Passive 04 +Bactalisk Under Attack 01 +Bactalisk Under Attack 02 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index cce91b6f..5ceb1696 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4478,4 +4478,44 @@ cm\f-t\shaman-upstart\wf-01.wav cm\f-t\shaman-upstart\wf-02.wav cm\f-t\arquebus\wf-01.wav cm\f-t\arquebus\wf-02.wav -cm\f-t\arquebus\wf-03.wav \ No newline at end of file +cm\f-t\arquebus\wf-03.wav +cm\f-p\vestige\wf-01.wav +cm\f-p\vestige\wf-02.wav +cm\f-p\vestige\wf-03.wav +cm\z\othstoleth\dth-01.wav +cm\z\othstoleth\rdy-01.wav +cm\z\othstoleth\wht-01.wav +cm\z\othstoleth\wht-02.wav +cm\z\othstoleth\wht-03.wav +cm\z\othstoleth\wht-04.wav +cm\z\othstoleth\yes-01.wav +cm\z\othstoleth\yes-02.wav +cm\z\othstoleth\yes-03.wav +cm\z\othstoleth\yes-04.wav +cm\z\othstoleth\hlp-01.wav +cm\z\othstoleth\hlp-02.wav +cm\z\othstoleth\hlp-03.wav +cm\z\tosgrilisk\dth-01.wav +cm\z\tosgrilisk\rdy-01.wav +cm\z\tosgrilisk\wht-01.wav +cm\z\tosgrilisk\wht-02.wav +cm\z\tosgrilisk\wht-03.wav +cm\z\tosgrilisk\wht-04.wav +cm\z\tosgrilisk\yes-01.wav +cm\z\tosgrilisk\yes-02.wav +cm\z\tosgrilisk\yes-03.wav +cm\z\tosgrilisk\yes-04.wav +cm\z\tosgrilisk\hlp-01.wav +cm\z\tosgrilisk\hlp-02.wav +cm\z\tosgrilisk\hlp-03.wav +cm\z\tosgrilisk\hlp-04.wav +cm\z\bactalisk\rdy-01.wav +cm\z\bactalisk\wht-01.wav +cm\z\bactalisk\wht-02.wav +cm\z\bactalisk\wht-03.wav +cm\z\bactalisk\yes-01.wav +cm\z\bactalisk\yes-02.wav +cm\z\bactalisk\yes-03.wav +cm\z\bactalisk\yes-04.wav +cm\z\bactalisk\hlp-01.wav +cm\z\bactalisk\hlp-02.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 9702ce45..cc3109ae 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 0c34573a..80892de8 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1216,8 +1216,8 @@ Ifrit (Tank Mode) Ifrit Turret (Tank Mode) Ifrit (Siege Mode) Ifrit Turret (Siege Mode) -Extended Sprite #702 -Extended Sprite #703 +Tirade (Deployed) +Magian Extended Sprite #704 Extended Sprite #705 Extended Sprite #706 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index ccf5caa7..6e019766 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/techdata.txt b/mpq/arr/techdata.txt index 6c70cb27..0f85686d 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -52,7 +52,7 @@ Lobotomy Grenade (Goska dupe) Skryspawn (Stroluum) Puppeteer (Askosi) Blood Burst (Bloodsummon) -Extended Tech #11 +Landfall (Askosi) Extended Tech #12 Extended Tech #13 Extended Tech #14 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 72840b33..5959ee87 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 8b960434..24c9cf8b 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -660,7 +660,7 @@ Ifrit Turret (Tank) Terran Ifrit (Siege) Ifrit Turret (Siege) Askosi Magian -Extended Unit #435 +Askosi Tirade (Deployed) Extended Unit #436 Extended Unit #437 Extended Unit #438 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index beadd1f9..49eaaafb 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 9011f178..9526ff5c 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -319,9 +319,9 @@ Zethal Spores (Zethalisk) Sacred Saber (Athuzelon) Incendiary Cannon (Ifrit, Tank) Incendiary Strike Cannon (Ifrit, Siege) -Extended Weapon #192 -Extended Weapon #193 -Extended Weapon #194 +Ikta Driver (Tirade, Deployed) +Erce Twinburst (Magian) +Landfall (Askosi) Extended Weapon #195 Extended Weapon #196 Extended Weapon #197 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 84a8ccbe..99e479e8 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index fcaeb5cc..b79f29c3 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index c0382658..6cc9de00 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 08117f2f..90e1ef11 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 954c3c47..b787bf80 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/a/hammer/fid00.smk b/mpq/portrait/a/hammer/fid00.smk new file mode 100644 index 00000000..80b4c301 Binary files /dev/null and b/mpq/portrait/a/hammer/fid00.smk differ diff --git a/mpq/portrait/a/hammer/fid01.smk b/mpq/portrait/a/hammer/fid01.smk new file mode 100644 index 00000000..4fa315ba Binary files /dev/null and b/mpq/portrait/a/hammer/fid01.smk differ diff --git a/mpq/portrait/a/hammer/fid02.smk b/mpq/portrait/a/hammer/fid02.smk new file mode 100644 index 00000000..56d1fd92 Binary files /dev/null and b/mpq/portrait/a/hammer/fid02.smk differ diff --git a/mpq/portrait/a/hammer/tlk00.smk b/mpq/portrait/a/hammer/tlk00.smk new file mode 100644 index 00000000..b0f40813 Binary files /dev/null and b/mpq/portrait/a/hammer/tlk00.smk differ diff --git a/mpq/portrait/a/hammer/tlk01.smk b/mpq/portrait/a/hammer/tlk01.smk new file mode 100644 index 00000000..7522a93a Binary files /dev/null and b/mpq/portrait/a/hammer/tlk01.smk differ diff --git a/mpq/portrait/a/hammer/tlk02.smk b/mpq/portrait/a/hammer/tlk02.smk new file mode 100644 index 00000000..9f194604 Binary files /dev/null and b/mpq/portrait/a/hammer/tlk02.smk differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index ce15d51b..e0f5ebe3 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -305,7 +305,7 @@ <0> <0> <0> -<0> +z<3><4>Landfall <1>(<3>Z<1>)<10>Leaps to the target ground ally within 5 range, activating Impact Dissipation for all allies within 3 range of the jump target.<10>After 3 seconds, if the Magian endures, all targets within 3 range of the jump site are teleported to the Magian.<0> e<3><4>Siege Mode <1>(<3>E<1>)<10>Switches forms, gaining splash radius and weapon range, while disabling movement.<0> e<0><4>Tank Mode <1>(<3>E<1>)<10>Returns the Ifrit's weapon and mobility to normal.<0> ยค<3><4>Plasma Conduit <2>(passive)<10>Effects that restore shields are twice as effective for this combatant.<0> @@ -1445,8 +1445,8 @@ z<3><4>Blissful Embrace <1>(<3>Z<1>)<10>Channels onto the target. If the target s<1><4>Morph into Skithrokor <1>(<3>S<1>)<10>Airborne duelist strain.<0> Skithrokor requires:<10> Skibact Scab<0> a<1><4>Warp in Athuzelon <1>(<3>A<1>)<10>Peerless vanguard.<0> -<0> -<0> +s<1><4>Raise Magian <1>(<3>S<1>)<10>Fickle trooper.<0> +Magian requires:<10> Radix OR Function<0> <0> Blackjack requires:<10> Scrapyard<0> Matador requires:<10> Scrapyard<0> @@ -2318,9 +2318,9 @@ Zethal Spores<0> Sacred Saber<0> Incendiary Cannon<0> Incendiary Strike Cannon<0> -<0> -<0> -<0> +Ikta Driver<0> +Erce Twinburst<0> +Landfall<0> <0> <0> <0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 2f701815..a4cea569 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 70ee1b1b..a58b6c94 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 77eb4a66..b8828078 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1661,15 +1661,19 @@ TiradeGndAttkInit: wait 1 nobrkcodestart playfram 0x00 + wait 1 + playfram 0x20 + playsndbtwn 4052 4054 # Tirade weaponfire 01, 02, 03 attackwith 1 wait 1 + playfram 0x00 nobrkcodeend gotorepeatattk goto TiradeGndAttkToIdle TiradeWalking: setvertpos 0 -# imgol 225 0 5 # Tirade Engines (thingy\tdrGlow.grp) + imgol 2526 0 0 # Tirade Engines (cm\a\tirade-engine.grp) goto SkryrokorLocal00 TiradeSpecialState1: @@ -1864,6 +1868,7 @@ ProselyteGndAttkRpt: wait 1 nobrkcodestart playfram 0x40 + playsndbtwn 4154 4157 # Proselyte weaponfire 01, 02, 03, 04 attackwith 1 wait 1 playfram 0x20 @@ -4261,7 +4266,7 @@ IconoclastGndAttkInit: IconoclastWalking: setvertpos 0 - imgol 2506 0 0 # Iconoclast Engines (cm\a\iconoclast-engines.grp) + imgol 2506 0 0 # Iconoclast Engines (cm\a\iconoclast-engine.grp) goto SkryrokorLocal00 IconoclastSpecialState1: @@ -6620,4 +6625,237 @@ ScraliaWalking: ScraliaSpecialState1: playfram 0x00 wait 12 - goto ScraliaGndAttkToIdle \ No newline at end of file + goto ScraliaGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2527 Tirade (Deployed) (cm\a\tirade-deployed.grp) +.headerstart +IsId 76 +Type 21 +Init TiradeDeployedInit +Death TiradeDeployedDeath +GndAttkInit TiradeDeployedGndAttkInit +AirAttkInit TiradeDeployedGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt TiradeDeployedGndAttkInit +AirAttkRpt TiradeDeployedGndAttkInit +CastSpell [NONE] +GndAttkToIdle TiradeDeployedGndAttkToIdle +AirAttkToIdle TiradeDeployedGndAttkToIdle +Unused2 [NONE] +Walking TiradeDeployedWalking +WalkingToIdle TiradeDeployedLocal00 +SpecialState1 TiradeDeployedSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +TiradeDeployedInit: + imgul 2179 0 5 # Tirade Shadow (cm\a\tirade.grp) +TiradeDeployedGndAttkToIdle: + playfram 0x00 +TiradeDeployedLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto TiradeDeployedLocal00 + +TiradeDeployedDeath: + playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + wait 1 + end + +TiradeDeployedGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + wait 1 + playfram 0x20 + playsndbtwn 4052 4054 # Tirade weaponfire 01, 02, 03 + attackwith 1 + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + goto TiradeDeployedGndAttkToIdle + +TiradeDeployedWalking: + goto SkryrokorLocal00 + +TiradeDeployedSpecialState1: + playfram 0x00 + wait 12 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2528 Magian (cm\f-a\magian.grp) +.headerstart +IsId 77 +Type 12 +Init MagianInit +Death MagianDeath +GndAttkInit MagianGndAttkInit +AirAttkInit MagianGndAttkInit +Unused1 MagianUnused1 +GndAttkRpt MagianGndAttkRpt +AirAttkRpt MagianGndAttkRpt +CastSpell [NONE] +GndAttkToIdle MagianGndAttkToIdle +AirAttkToIdle MagianGndAttkToIdle +Unused2 [NONE] +Walking MagianWalking +WalkingToIdle MagianWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MagianInit: + imgulnextid 0 0 # Magian Shadow (cm\f-a\magian-shadow.grp) +MagianWalkingToIdle: + playfram 0x00 +MagianLocal00: + wait 63 + randcondjmp 25 MagianLocal01 + randcondjmp 128 MagianLocal02 + goto MagianLocal00 + +MagianLocal01: + playfram 0x20 + wait 1 + randcondjmp 192 MagianLocal03 + 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 MagianWalkingToIdle + +MagianLocal03: + wait 13 + goto MagianWalkingToIdle + +MagianLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto MagianWalkingToIdle + +MagianDeath: + 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) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + setfldirect 0 + wait 8 + lowsprul 1064 0 0 # Magian Remnants (cm\a\proselyte-remnants.grp) + wait 1 + end + +MagianUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto MagianWalkingToIdle + +MagianGndAttkInit: + playfram 0x20 +MagianGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x40 + playsndbtwn 4154 4157 # Proselyte weaponfire 01, 02, 03, 04 + attackwith 1 + wait 1 + playfram 0x20 + wait 1 + nobrkcodeend + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + gotorepeatattk + ignorerest +MagianGndAttkToIdle: + goto MagianWalkingToIdle + +MagianWalking: + move 4 + wait 1 + playfram 0x80 + 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 0x60 + goto MagianWalking \ No newline at end of file diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 9f9bf0e8..6da75c9a 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index 340194f3..fd942aaa 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -5010,7 +5010,7 @@ VicereWarpIn: # 2347 Athla (hl\fr\athla.grp) .headerstart IsId 383 -Type 15 +Type 21 Init AthlaInit Death AthlaDeath GndAttkInit AthlaGndAttkInit @@ -5027,6 +5027,12 @@ WalkingToIdle AthlaGndAttkToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt AthlaAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ExigoWarpIn .headerend # ----------------------------------------------------------------------------- # diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 832a53b2..67a1e3eb 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 71eb49fe..5c53f60a 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -15878,23 +15878,23 @@ PathlightWarpIn: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1174 Cabalist (Starbound) (cm\f-p\cabalist-starbound.grp) +# 1174 Vestige (cm\f-p\vestige.grp) .headerstart IsId 736 Type 21 -Init CabalistStarboundInit -Death CabalistStarboundDeath -GndAttkInit CabalistStarboundGndAttkInit -AirAttkInit CabalistStarboundGndAttkInit +Init VestigeInit +Death VestigeDeath +GndAttkInit VestigeGndAttkInit +AirAttkInit VestigeGndAttkInit Unused1 SkryrokorLocal00 -GndAttkRpt CabalistStarboundGndAttkRpt -AirAttkRpt CabalistStarboundGndAttkRpt +GndAttkRpt VestigeGndAttkRpt +AirAttkRpt VestigeGndAttkRpt CastSpell [NONE] -GndAttkToIdle CabalistStarboundGndAttkToIdle -AirAttkToIdle CabalistStarboundGndAttkToIdle +GndAttkToIdle VestigeGndAttkToIdle +AirAttkToIdle VestigeGndAttkToIdle Unused2 [NONE] -Walking CabalistStarboundWalking -WalkingToIdle CabalistStarboundWalkingToIdle +Walking VestigeWalking +WalkingToIdle VestigeWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -15903,22 +15903,22 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn CabalistStarboundWarpIn +WarpIn VestigeWarpIn .headerend # ----------------------------------------------------------------------------- # -CabalistStarboundInit: - imgulnextid 0 0 # Cabalist (Starbound) Shadow (cm\f-p\cabalist-starbound-shadow.grp) +VestigeInit: + imgulnextid 0 0 # Vestige Shadow (cm\f-p\vestige-shadow.grp) playfram 0x00 wait 2 goto SkryrokorLocal00 -CabalistStarboundGndAttkToIdle: +VestigeGndAttkToIdle: playfram 0x00 wait 2 goto SkryrokorLocal00 -CabalistStarboundDeath: +VestigeDeath: playsnd 741 # Protoss\DARKTEMPLAR\PDTDth00.WAV imgol 153 0 0 # Zealot Death (protoss\zealot.grp) wait 1 @@ -15926,18 +15926,18 @@ CabalistStarboundDeath: wait 1 end -CabalistStarboundGndAttkInit: +VestigeGndAttkInit: playfram 0x20 wait 1 - goto CabalistStarboundGndAttkRpt -CabalistStarboundGndAttkRpt: + goto VestigeGndAttkRpt +VestigeGndAttkRpt: nobrkcodestart playfram 0x60 wait 1 playfram 0x80 wait 1 playfram 0xA0 - attackmelee 1 111 # Bullet\UZeFir00.wav + attackmelee 3 4481 4482 4483 # Vestige weaponfire 01, 02, 03 wait 1 playfram 0xC0 wait 1 @@ -15951,9 +15951,9 @@ CabalistStarboundGndAttkRpt: playfram 0x20 wait 1 gotorepeatattk - goto CabalistStarboundGndAttkToIdle + goto VestigeGndAttkToIdle -CabalistStarboundWalking: +VestigeWalking: move 5 wait 1 playfram 0x120 @@ -15981,15 +15981,15 @@ CabalistStarboundWalking: move 5 wait 1 playfram 0x220 - goto CabalistStarboundWalking + goto VestigeWalking -CabalistStarboundWalkingToIdle: +VestigeWalkingToIdle: playfram 0x00 goto SkryrokorLocal00 -CabalistStarboundWarpIn: - imgol 2123 0 0 # CabalistStarbound Warp Flash (cm\protoss\cabalist-starbound.grp) - goto CabalistStarboundWalkingToIdle +VestigeWarpIn: + imgol 2123 0 0 # Vestige Warp Flash (cm\protoss\cabalist-starbound.grp) + goto VestigeWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 6d2e4a77..49dcc3d5 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 899e301d..445a8ece 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -6887,7 +6887,7 @@ OthstolethLocal00: goto OthstolethLocal00 OthstolethDeath: - playsnd 910 # Zerg\ovileth\ZOvDth00.WAV + playsnd 4484 # Othstoleth death 01 imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) wait 1 lowsprul 186 0 42 # Zerg Building Rubble Small @@ -13430,7 +13430,7 @@ TosgriliskLocal00: goto TosgriliskLocal00 TosgriliskDeath: - playsnd 942 # Zerg\Mutalid\ZMuDth00.WAV + playsnd 4497 # Tosgrilisk death 01 imgol 41 0 0 # Tosgrilisk Death (zerg\zmuDeath.grp) wait 1 lowsprul 848 0 42 # Zerg Unit Rubble Medium diff --git a/mpq/sound/cm/f-p/vestige/wf-01.wav b/mpq/sound/cm/f-p/vestige/wf-01.wav new file mode 100644 index 00000000..39d6f443 Binary files /dev/null and b/mpq/sound/cm/f-p/vestige/wf-01.wav differ diff --git a/mpq/sound/cm/f-p/vestige/wf-02.wav b/mpq/sound/cm/f-p/vestige/wf-02.wav new file mode 100644 index 00000000..c2d867f6 Binary files /dev/null and b/mpq/sound/cm/f-p/vestige/wf-02.wav differ diff --git a/mpq/sound/cm/f-p/vestige/wf-03.wav b/mpq/sound/cm/f-p/vestige/wf-03.wav new file mode 100644 index 00000000..c5ffbf6f Binary files /dev/null and b/mpq/sound/cm/f-p/vestige/wf-03.wav differ diff --git a/mpq/sound/cm/z/_building/axtoth-axis.wav b/mpq/sound/cm/z/_building/axtoth-axis.wav new file mode 100644 index 00000000..38b485ad Binary files /dev/null and b/mpq/sound/cm/z/_building/axtoth-axis.wav differ diff --git a/mpq/sound/cm/z/bactalisk/dth-01.wav b/mpq/sound/cm/z/bactalisk/dth-01.wav index df509f55..ad165c45 100644 Binary files a/mpq/sound/cm/z/bactalisk/dth-01.wav and b/mpq/sound/cm/z/bactalisk/dth-01.wav differ diff --git a/mpq/sound/cm/z/bactalisk/hlp-01.wav b/mpq/sound/cm/z/bactalisk/hlp-01.wav new file mode 100644 index 00000000..495837a9 Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/hlp-01.wav differ diff --git a/mpq/sound/cm/z/bactalisk/hlp-02.wav b/mpq/sound/cm/z/bactalisk/hlp-02.wav new file mode 100644 index 00000000..ea6c7b32 Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/hlp-02.wav differ diff --git a/mpq/sound/cm/z/bactalisk/rdy-01.wav b/mpq/sound/cm/z/bactalisk/rdy-01.wav new file mode 100644 index 00000000..69a52103 Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/rdy-01.wav differ diff --git a/mpq/sound/cm/z/bactalisk/wht-01.wav b/mpq/sound/cm/z/bactalisk/wht-01.wav new file mode 100644 index 00000000..234a8eb9 Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/wht-01.wav differ diff --git a/mpq/sound/cm/z/bactalisk/wht-02.wav b/mpq/sound/cm/z/bactalisk/wht-02.wav new file mode 100644 index 00000000..f0f300cc Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/wht-02.wav differ diff --git a/mpq/sound/cm/z/bactalisk/wht-03.wav b/mpq/sound/cm/z/bactalisk/wht-03.wav new file mode 100644 index 00000000..1973f4bf Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/wht-03.wav differ diff --git a/mpq/sound/cm/z/bactalisk/yes-00.wav b/mpq/sound/cm/z/bactalisk/yes-00.wav new file mode 100644 index 00000000..821dc14d Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/yes-00.wav differ diff --git a/mpq/sound/cm/z/bactalisk/yes-01.wav b/mpq/sound/cm/z/bactalisk/yes-01.wav new file mode 100644 index 00000000..8c976b4a Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/yes-01.wav differ diff --git a/mpq/sound/cm/z/bactalisk/yes-02.wav b/mpq/sound/cm/z/bactalisk/yes-02.wav new file mode 100644 index 00000000..8152e704 Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/yes-02.wav differ diff --git a/mpq/sound/cm/z/bactalisk/yes-03.wav b/mpq/sound/cm/z/bactalisk/yes-03.wav new file mode 100644 index 00000000..5c6d839b Binary files /dev/null and b/mpq/sound/cm/z/bactalisk/yes-03.wav differ diff --git a/mpq/sound/cm/z/othstoleth/dth-01.wav b/mpq/sound/cm/z/othstoleth/dth-01.wav new file mode 100644 index 00000000..206b3813 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/dth-01.wav differ diff --git a/mpq/sound/cm/z/othstoleth/hlp-01.wav b/mpq/sound/cm/z/othstoleth/hlp-01.wav new file mode 100644 index 00000000..953bb94b Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/hlp-01.wav differ diff --git a/mpq/sound/cm/z/othstoleth/hlp-02.wav b/mpq/sound/cm/z/othstoleth/hlp-02.wav new file mode 100644 index 00000000..d44fb546 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/hlp-02.wav differ diff --git a/mpq/sound/cm/z/othstoleth/hlp-03.wav b/mpq/sound/cm/z/othstoleth/hlp-03.wav new file mode 100644 index 00000000..b9272796 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/hlp-03.wav differ diff --git a/mpq/sound/cm/z/othstoleth/rdy-01.wav b/mpq/sound/cm/z/othstoleth/rdy-01.wav new file mode 100644 index 00000000..588cbd68 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/rdy-01.wav differ diff --git a/mpq/sound/cm/z/othstoleth/wht-01.wav b/mpq/sound/cm/z/othstoleth/wht-01.wav new file mode 100644 index 00000000..b6b298a5 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/wht-01.wav differ diff --git a/mpq/sound/cm/z/othstoleth/wht-02.wav b/mpq/sound/cm/z/othstoleth/wht-02.wav new file mode 100644 index 00000000..096f5477 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/wht-02.wav differ diff --git a/mpq/sound/cm/z/othstoleth/wht-03.wav b/mpq/sound/cm/z/othstoleth/wht-03.wav new file mode 100644 index 00000000..6a7e002d Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/wht-03.wav differ diff --git a/mpq/sound/cm/z/othstoleth/wht-04.wav b/mpq/sound/cm/z/othstoleth/wht-04.wav new file mode 100644 index 00000000..f496d0a2 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/wht-04.wav differ diff --git a/mpq/sound/cm/z/othstoleth/yes-01.wav b/mpq/sound/cm/z/othstoleth/yes-01.wav new file mode 100644 index 00000000..47dbfd0a Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/yes-01.wav differ diff --git a/mpq/sound/cm/z/othstoleth/yes-02.wav b/mpq/sound/cm/z/othstoleth/yes-02.wav new file mode 100644 index 00000000..58c91912 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/yes-02.wav differ diff --git a/mpq/sound/cm/z/othstoleth/yes-03.wav b/mpq/sound/cm/z/othstoleth/yes-03.wav new file mode 100644 index 00000000..52fd8a00 Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/yes-03.wav differ diff --git a/mpq/sound/cm/z/othstoleth/yes-04.wav b/mpq/sound/cm/z/othstoleth/yes-04.wav new file mode 100644 index 00000000..9b540e1d Binary files /dev/null and b/mpq/sound/cm/z/othstoleth/yes-04.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/dth-01.wav b/mpq/sound/cm/z/tosgrilisk/dth-01.wav new file mode 100644 index 00000000..20b8cc4e Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/dth-01.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/hlp-01.wav b/mpq/sound/cm/z/tosgrilisk/hlp-01.wav new file mode 100644 index 00000000..6250062e Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/hlp-01.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/hlp-02.wav b/mpq/sound/cm/z/tosgrilisk/hlp-02.wav new file mode 100644 index 00000000..2a869821 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/hlp-02.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/hlp-03.wav b/mpq/sound/cm/z/tosgrilisk/hlp-03.wav new file mode 100644 index 00000000..723f1f1e Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/hlp-03.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/hlp-04.wav b/mpq/sound/cm/z/tosgrilisk/hlp-04.wav new file mode 100644 index 00000000..41bf681f Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/hlp-04.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/rdy-01.wav b/mpq/sound/cm/z/tosgrilisk/rdy-01.wav new file mode 100644 index 00000000..ff41d43d Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/rdy-01.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wht-01.wav b/mpq/sound/cm/z/tosgrilisk/wht-01.wav new file mode 100644 index 00000000..dfe3f5ca Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wht-01.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wht-02.wav b/mpq/sound/cm/z/tosgrilisk/wht-02.wav new file mode 100644 index 00000000..511b4a0f Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wht-02.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wht-03.wav b/mpq/sound/cm/z/tosgrilisk/wht-03.wav new file mode 100644 index 00000000..bbe0b2db Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wht-03.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/wht-04.wav b/mpq/sound/cm/z/tosgrilisk/wht-04.wav new file mode 100644 index 00000000..fee8f7b5 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/wht-04.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/yes-01.wav b/mpq/sound/cm/z/tosgrilisk/yes-01.wav new file mode 100644 index 00000000..11b682de Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/yes-01.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/yes-02.wav b/mpq/sound/cm/z/tosgrilisk/yes-02.wav new file mode 100644 index 00000000..4e3f78f3 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/yes-02.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/yes-03.wav b/mpq/sound/cm/z/tosgrilisk/yes-03.wav new file mode 100644 index 00000000..160d76d6 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/yes-03.wav differ diff --git a/mpq/sound/cm/z/tosgrilisk/yes-04.wav b/mpq/sound/cm/z/tosgrilisk/yes-04.wav new file mode 100644 index 00000000..e1e01c59 Binary files /dev/null and b/mpq/sound/cm/z/tosgrilisk/yes-04.wav differ diff --git a/mpq/unit/cm/a/tirade-attack.lol b/mpq/unit/cm/a/tirade-attack.lol new file mode 100644 index 00000000..036b30e1 Binary files /dev/null and b/mpq/unit/cm/a/tirade-attack.lol differ diff --git a/mpq/unit/cm/a/tirade-deployed-attack.lol b/mpq/unit/cm/a/tirade-deployed-attack.lol new file mode 100644 index 00000000..a4fdcc3a Binary files /dev/null and b/mpq/unit/cm/a/tirade-deployed-attack.lol differ diff --git a/mpq/unit/cm/a/tirade-deployed.grp b/mpq/unit/cm/a/tirade-deployed.grp new file mode 100644 index 00000000..3302c8a3 Binary files /dev/null and b/mpq/unit/cm/a/tirade-deployed.grp differ diff --git a/mpq/unit/cm/a/tirade-engine.grp b/mpq/unit/cm/a/tirade-engine.grp new file mode 100644 index 00000000..cc231f8a Binary files /dev/null and b/mpq/unit/cm/a/tirade-engine.grp differ diff --git a/mpq/unit/cm/a/tirade.grp b/mpq/unit/cm/a/tirade.grp index f31d5927..a8cf57e2 100644 Binary files a/mpq/unit/cm/a/tirade.grp and b/mpq/unit/cm/a/tirade.grp differ diff --git a/mpq/unit/cm/f-a/magian-shadow.grp b/mpq/unit/cm/f-a/magian-shadow.grp new file mode 100644 index 00000000..739e8dc7 Binary files /dev/null and b/mpq/unit/cm/f-a/magian-shadow.grp differ diff --git a/mpq/unit/cm/f-a/magian.grp b/mpq/unit/cm/f-a/magian.grp new file mode 100644 index 00000000..93198fae Binary files /dev/null and b/mpq/unit/cm/f-a/magian.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 8e9dff0f..9f39e920 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 17696904..eed72d65 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 40049bcc..1680b725 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 5ab796e8..1c6f0889 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 64aef375..8c4f578d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,8 +1,8 @@ -# 3 October 2026 -## Year 4, month 9, patch 1 +# 10 October 2026 +## Year 4, month 9, patch 2 ## Patch goals -- Continue technical improvements, bugfixes, and audiovisual additions ahead of the Gauntlet Stages! +- Continue technical improvements, bugfixes, and audiovisual additions ahead of each of the Gauntlet Stages! - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! - Join our communities ([Discord](https://discord.com/invite/s5SKBmY) | [Fluxer](https://fluxer.gg/1rebBmBw)), or get in touch with Pr0nogo via email! pr0nogo@fraudsclub.com @@ -23,6 +23,7 @@ - Resolved a briefing crash for Zerg scenarios (r. SgzzZ) - **Gameplay:** - Fixed bad transport calculations allowing for "clown-car" interactions (r. Londier) + - Significantly improved Askosi teleportation accuracy! - Droleths can no longer morph into Agrileths in certain circumstances (r. jakulangski) - Corrected Ultrokor Kaiser Rampage timeout (r. Londier) - Fixed edge cases regarding Dorminge Crushing Delivery slow (r. Londier) @@ -52,8 +53,10 @@ - New selection responses for: - Wellbore, Engram, Chokral Chazsal (c. jun3hong) - New weapon SFX for: - - Durendal, Cyprian (Hecaton), Shaman (Upstart), Arquebus, Quadriga, Adherent, Engram, Gosvileth, Ghitorokor, Inzorthrokor, Zobriolisk, Tetcaerokor, Garvrokor (c. lolrsk8s) -- New unit responses for Gosvileth + - Durendal, Cyprian (Hecaton), Shaman (Upstart), Arquebus, Quadriga, Adherent, Vestige, Engram, Gosvileth, Ghitorokor, Inzorthrokor, Zobriolisk, Tetcaerokor, Garvrokor (c. lolrsk8s) +- New unit responses for: + - Gosvileth + - Othstoleth, Tosgrilisk, Bactalisk (c. jun3hong) ## Terran factions - **NEW:** [Ifrit](https://cosmonarchy.com/terran/ifrit): @@ -73,4 +76,14 @@ ## Zerg factions - **NEW:** [Zethalisk](https://cosmonarchy.com/zerg/zethalisk): - Orkoti Tendril - Zethrokor replacement. Sustaining strain. - - Bartered for by lolrsk8s! \ No newline at end of file + - Bartered for by lolrsk8s! + +## Askosi +- [Tirade](https://cosmonarchy.com/askosi/tirade): + - **Excoriation Assembly:** + - Now deploys into a grounded unit on proc. + +## Askosi factions +- **NEW:** [Magian](https://cosmonarchy.com/askosi/magian): + - Sons of Ash - Proselyte replacement. Fickle trooper. + - Community milestone reward, thanks to Jesse and IAMtheWHEATofGOD! \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index b1027058..c6a5d6b4 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ