diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e0c7b19b..e5da4597 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 6f92bc69..06e66ece 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 ce19fcd7..c2763fa1 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 093e86c2..b1f25387 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 6d2d8e85..69f7549a 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 4944392c..3af6998f 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index ccb00660..669ca518 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 e1592961..2ab31233 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -371,11 +371,11 @@ q<1><4>Morph into Quazilisks <1>(<3>Q<1>)<10>Pursuant strain.<0> Quazilisk requires:<10> Quazeth Pool<0> r<3><4>Burrow <1>(<3>R<1>)<10>Burrows the unit, concealing it from enemy vision and rendering it immobile.<0> r<0><4>Unburrow <1>(<3>R<1>)<10>Unburrows the unit, revealing it and allowing it to move.<0> -<0> -<0> +¤<3><4>New Dominion <2>(passive)<10>When allies unload from this transport, they gain 33% attack speed for 10 seconds.<0> +¤<3><4>Terrestrial Assembly <2>(passive)<10>Upon taking fatal damage while mobile, Petracts embed themselves into the surface, becoming immobile and more heavily-armored.<10>During this time, their weapon targets air and ground, and loaded combatants may return fire.<0> w<3><4>Carapace Swarm <1>(<3>W<1>)<10>Creates damage-absorbing cloud cover that lasts for 25 seconds or until it has absorbed 1000 damage.<0> x<3><4>Parasitic Excision <1>(<3>X<1>)<10>After a 1-second channel, the Matraleth deposits a Vilgoleth at the target location.<0> -<0> +¤<3><4>Warring Winds <2>(passive)<10>Every time the Phontis is struck, it releases a healing pulse worth 5 HP for allies within 8 range.<10>After sustaining ten attacks, the Phontis pulls all combatants within 8 range towards itself.<0> ¤<3><4>Scrapworld: Implosion <2>(passive)<10>This combatant detonates 1 seconds after death, pulling all combatants within 6 range towards its death site and slowing their movement speed by 33% for 5 seconds.<0> g<3><4>Plague <1>(<3>G<1>)<10>After a 1-second channel, creates a 3-range zone that lasts 10 seconds. Victims that enter the zone are infected with Plague, and take up to 50 damage over 5 seconds.<10>On death, victims create a smaller 1.5-range infection zone that lasts 5 seconds. Plague cannot kill its victims.<0> ¤<3><4>Ensnaring Brood <2>(passive)<10>Allies within 4 range of a Matraleth apply Ensnare with every attack. Ensnared targets move and attack 33% slower. Ensnare expires after 2 seconds.<0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 7feb6944..04b9c98d 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 2f280317..2f79a0c7 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -2021,7 +2021,7 @@ MimicWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 4026 Intendent (cm\askosi\intendent.grp) +# 2218 Intendent (cm\askosi\intendent.grp) .headerstart IsId 23 Type 21 @@ -4296,4 +4296,188 @@ ZonguardGndAttkInit: ZonguardWalking: playfram 0x00 setvertpos 0 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2286 Petract (cm\askosi\petract.grp) +.headerstart +IsId 51 +Type 13 +Init PetractInit +Death PetractDeath +GndAttkInit PetractGndAttkInit +AirAttkInit PetractGndAttkInit +Unused1 PetractUnused1 +GndAttkRpt PetractGndAttkInit +AirAttkRpt PetractGndAttkInit +CastSpell [NONE] +GndAttkToIdle PetractGndAttkToIdle +AirAttkToIdle PetractGndAttkToIdle +Unused2 [NONE] +Walking PetractWalking +WalkingToIdle PetractGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +PetractInit: + imgulnextid 0 0 # Petract Shadow (cm\askosi\petract-shadow.grp) + playfram 0x00 + goto PetractGndAttkToIdle + +PetractGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto PetractGndAttkToIdle + +PetractDeath: + playsnd 353 # Terran\Petract\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + end + +PetractUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Petract revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto PetractGndAttkToIdle + +PetractGndAttkInit: + wait 1 + attackwith 1 + attackwith 1 + gotorepeatattk + goto PetractGndAttkToIdle + +PetractWalking: + playfram 0x00 + setvertpos 0 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2288 Phontis (cm\askosi\phontis.grp) +.headerstart +IsId 52 +Type 21 +Init PhontisInit +Death PhontisDeath +GndAttkInit PhontisGndAttkInit +AirAttkInit PhontisGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt PhontisGndAttkInit +AirAttkRpt PhontisGndAttkInit +CastSpell [NONE] +GndAttkToIdle PhontisGndAttkToIdle +AirAttkToIdle PhontisGndAttkToIdle +Unused2 [NONE] +Walking PhontisWalking +WalkingToIdle PhontisGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +PhontisInit: + imgulnextid 0 0 # Phontis Shadow (cm\askosi\phontis-shadow.grp) + goto PhontisGndAttkToIdle + +PhontisGndAttkToIdle: + playfram 0x220 + goto SkryrokorLocal00 + +PhontisDeath: + playsnd 533 # Protoss\Scout\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 2 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +PhontisGndAttkInit: + playfram 0x220 +PhontisGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x200 + playsndbtwn 1788 1790 # Atreus weapon fire 01, 02, 03 + attackwith 1 + wait 1 + playfram 0x220 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto PhontisGndAttkToIdle + +PhontisWalking: + move 4 + wait 1 + playfram 0x00 + move 4 + wait 1 + playfram 0x20 + move 4 + wait 1 + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + 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 0x160 + move 4 + wait 1 + playfram 0x180 + move 4 + wait 1 + playfram 0x1A0 + move 4 + wait 1 + playfram 0x1C0 + move 4 + wait 1 + playfram 0x1E0 + goto PhontisWalking \ No newline at end of file diff --git a/mpq/unit/cm/askosi/petract-shadow.grp b/mpq/unit/cm/askosi/petract-shadow.grp new file mode 100644 index 00000000..20d6a1b4 Binary files /dev/null and b/mpq/unit/cm/askosi/petract-shadow.grp differ diff --git a/mpq/unit/cm/askosi/petract.grp b/mpq/unit/cm/askosi/petract.grp new file mode 100644 index 00000000..83104d0a Binary files /dev/null and b/mpq/unit/cm/askosi/petract.grp differ diff --git a/mpq/unit/cm/askosi/scralia.grp b/mpq/unit/cm/askosi/scralia.grp new file mode 100644 index 00000000..f5db55fe Binary files /dev/null and b/mpq/unit/cm/askosi/scralia.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 0422312a..760a3ddd 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 6f9efa94..aa550342 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 d6bc4913..df586d55 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -63,7 +63,8 @@ - **New arrivals:** - T1: Eyelet (from Proselyte) - T2: Constituent (from Bounty) - - T2: Biotic (Aphorist, Thaumalogue, Avatar, Doronin), Conduit, Bestiary + - T2: Biotic (Aphorist, Thaumalogue, Avatar, Doronin), Proscenium, Conduit + - T2: Mechanized (Agonist, Petract, Phontis), Zylode, Bestiary - T2: Skybound (Akreno, Iconoclast, Crematorium), Astrolabe - **Booming Blast:** - Used by **Vicar** diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8f62ffa8..35e08574 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ