diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 9c713fa6..8b64ad07 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 0af9d3b7..33391c27 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 8b5c3293..bf5b9fcd 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 2926c84b..2578c676 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index d7100a25..6c67aeb3 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 d394ce0b..9bd4043b 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -1,9 +1,9 @@ Stim Packs (Maverick) Lobotomy Grenade (Francisco Goska) Controlled Demolition (Terran) -Spider Mines (Vulture) +Terran Mines (+ Proselyte) Scanner Sweep (Comsat Station) -Siege Mode (Phalanx) +Deployed Mode (Terran) Defensive Matrix (Azazel) Irradiate (Seraph) Yamato Cannon (Magnetar) @@ -14,15 +14,15 @@ Rejoinder of Service (Serathiel) Ensnaring Brood (Matraleth) Carapace Swarm (Isthrathaleth) Plague (Ogroszaleth) -Consume (Zoryusthaleth) +Remote Hijack (Askosi) Land Grab (Wyvern) -Parasite (Matraleth) +Parasitic Excision (Matraleth) Psionic Storm (Cantavis) Hallucination (Cantavis) Recall (Didact) Stasis Field (Didact) Rematerialize (Askosi) -Savant Onhit Toggle +Preylock (Askosi) Disruption Field (Lanifect) Rescind Control (Mind Tyrant) Maledictus (Mind Tyrant) diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index e19c448b..a0222b5a 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 9300b4bd..8aefd18b 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 ed260022..f6ecf2b5 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 37126f2e..e9a49388 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index f21aa0e4..81f048fc 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -360,7 +360,7 @@ s<1><4>Morph into Protathalor <1>(<3>S<1>)<10>Mobile artillery strain.<0> <0> <0> <0> -<0> +c<3><4>Preylock <1>(<3>C<1>)<10>Pulls the target enemy within 5 range to the combatant's location, and afflicts it with Booming Blast.<0> b<1><4>Build Blackjack <1>(<3>B<1>)<10>Scrappy walker drone.<0> ¤<3><4>Labyrinthine Targeters <2>(passive)<10>So long as they are facing the targets, Minotaurs can attack up to 5 hostiles at once.<0> Almaksalisk requires:<10> Alkag Iteth<0> @@ -1791,7 +1791,7 @@ r<1><4>Build Priestess <1>(<3>R<1>)<10>Restorative infantry.<0> b<1><4>Build Barker <1>(<3>B<1>)<10>Frontline cavalry.<0> <27><0><4>Cancel Demolition <1>(<3>ESC<1>)<0> ¤<3><4>Evasive Maneuvers <2>(passive)<10>After falling below 30 HP, Stewards will return to their Solarion, regaining all HP and becoming cleansed of any debuffs.<0> -¤<3><4>Mechanical Rage <2>(passive)<10>After killing an enemy combatant, the Zonguard gains 7 bonus armor 2 seconds.<0> +¤<3><4>Mechanical Rage <2>(passive)<10>After killing an enemy combatant, the Zonguard gains 10 bonus armor 2 seconds.<0> Chokral Chaszal requires:<10> Othstol Oviform<0> <0> <0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 67d52d48..deb5b1fa 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 ba8b2601..4c389639 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -4294,15 +4294,22 @@ ZonguardUnused1: ZonguardGndAttkInit: wait 1 - attackwith 1 - attackwith 1 + nobrkcodestart + attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + wait 3 + nobrkcodeend gotorepeatattk goto ZonguardGndAttkToIdle ZonguardWalking: - playfram 0x00 setvertpos 0 - goto SkryrokorLocal00 + goto ZonguardWalkingLoop + +ZonguardWalkingLoop: + playfram 0x00 + move 4 + wait 1 + goto ZonguardWalkingLoop # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -4599,6 +4606,72 @@ ParacleteSpecialState1: playfram 0x00 wait 12 goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2298 Auxine (cm\askosi\auxine.grp) +.headerstart +IsId 55 +Type 21 +Init AuxineInit +Death AuxineDeath +GndAttkInit AuxineGndAttkInit +AirAttkInit AuxineGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt AuxineGndAttkInit +AirAttkRpt AuxineGndAttkInit +CastSpell [NONE] +GndAttkToIdle AuxineGndAttkToIdle +AirAttkToIdle AuxineGndAttkToIdle +Unused2 [NONE] +Walking AuxineWalking +WalkingToIdle AuxineLocal00 +SpecialState1 AuxineSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +AuxineInit: + imgulnextid 0 42 # Auxine Shadow (cm\askosi\paraclete.grp) +AuxineGndAttkToIdle: + playfram 0x00 +AuxineLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto AuxineLocal00 + +AuxineDeath: + playsnd 353 # Terran\Rove\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + end + +AuxineGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + attackwith 1 + wait 2 + nobrkcodeend + gotorepeatattk + goto AuxineGndAttkToIdle + +AuxineWalking: + setvertpos 0 +# imgol 225 0 5 # Auxine Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +AuxineSpecialState1: + playfram 0x00 + wait 12 + goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 9fcb8d0b..8e394a17 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ