diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index a3e5ab64..de76b9e6 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 66a6aa3d..6e6c85c0 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -656,7 +656,7 @@ Conduit Bestiary Eyelet Obelisk -Extended Flingy #450 +Auxine Extended Flingy #451 Extended Flingy #452 Extended Flingy #453 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d9dd8c21..d01b20c6 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 f92752f9..256fc510 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 e4acf9d4..fc8db59a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2282,22 +2282,22 @@ Eyelet Eyelet Shadow Obelisk Obelisk Shadow -Extended Image #1282 -Extended Image #1283 -Extended Image #1284 -Extended Image #1285 -Extended Image #1286 -Extended Image #1287 -Extended Image #1288 -Extended Image #1289 -Extended Image #1290 -Extended Image #1291 -Extended Image #1292 -Extended Image #1293 -Extended Image #1294 -Extended Image #1295 -Extended Image #1296 -Extended Image #1297 +Agonist +Agonist Shadow +Petract +Petract Shadow +Phontis +Phontis Shadow +Zonguard +Zonguard Shadow +Akreno +Akreno Shadow +Iconoclast +Iconoclast Shadow +Paraclete +Paraclete Shadow +Auxine +Auxine Shadow Extended Image #1298 Extended Image #1299 Extended Image #1300 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 96addf21..a4fee8d5 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 2a4b9824..01161b39 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1111,7 +1111,7 @@ Conduit Bestiary Eyelet Obelisk -Extended Sprite #597 +Auxine Extended Sprite #598 Extended Sprite #599 Extended Sprite #600 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 7ecfe4ff..25bce91e 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 9f18316a..d5a14b59 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -563,7 +563,7 @@ Askosi Bestiary Askosi Conduit Askosi Obelisk Askosi Eyelet -Extended Unit #338 +Askosi Auxine Extended Unit #339 Extended Unit #340 Extended Unit #341 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index bb3aece4..0f356eae 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 21dd6fda..d912de7e 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -218,7 +218,7 @@ Angeltear Rockets (Salamander) Brontes Payload (Cyclops) Flak Cannons (Cyclops Futurist) Sensory Overload (Vibrance) -Flamethrower (Harakan, Golden) +Onla Drivers (Agonist) Corrosive Bioplasma (Iziralisk) Korozzet Beastblades (Doronin) Utso Carbine (Thaumalogue) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 3d3a6944..b838307b 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 f56cd0cb..d14bd7a7 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 3f04db20..f8ac3ca0 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -453,7 +453,7 @@ e<1><4>Profanate Empress <1>(<3>E<1>)<10>Reinforcing destroyer.<0> ¤<3><4>Escape Velocity <2>(passive)<10>Algoztalisk projectiles gain +1 armor penetration for every range traveled.<0> <0> <0> -<0> +¤<3><4>Advancing Motion <2>(passive)<10>This combatant's primary weapon can be fired while moving.<0> Iron Foundry requires:<10> Daedala<0> f<1><4>Build Iron Foundry <1>(<3>F<1>)<10>Advanced vehicle production.<0> Proscenium requires:<10> Cipher AND Gauntlet<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> -<0> +¤<3><4>Mechanical Rage <2>(passive)<10>After killing an enemy combatant, the Zonguard gains 7 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 d1f16b85..502a0d30 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 bd3dc304..1c26fe27 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1101,7 +1101,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # RoveInit: - imgul 2109 0 7 # Rove Shadow (cm\askosi\rove.grp) + imgulnextid 0 7 # Rove Shadow (cm\askosi\rove.grp) playfram 0x00 goto RoveGndAttkToIdle @@ -3916,4 +3916,144 @@ ObeliskIsWorking: goto ObeliskIsWorking ObeliskDisable: - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2284 Agonist (cm\askosi\agonist.grp) +.headerstart +IsId 46 +Type 13 +Init AgonistInit +Death AgonistDeath +GndAttkInit AgonistGndAttkInit +AirAttkInit AgonistGndAttkInit +Unused1 AgonistUnused1 +GndAttkRpt AgonistGndAttkInit +AirAttkRpt AgonistGndAttkInit +CastSpell [NONE] +GndAttkToIdle AgonistGndAttkToIdle +AirAttkToIdle AgonistGndAttkToIdle +Unused2 [NONE] +Walking AgonistWalking +WalkingToIdle AgonistGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AgonistInit: + imgulnextid 0 7 # Agonist Shadow (cm\askosi\agonist.grp) + playfram 0x00 + goto AgonistGndAttkToIdle + +AgonistGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto AgonistGndAttkToIdle + +AgonistDeath: + playsnd 353 # Terran\Agonist\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 + +AgonistUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Agonist revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto AgonistGndAttkToIdle + +AgonistGndAttkInit: + wait 1 + attackwith 1 + attackwith 1 + gotorepeatattk + goto AgonistGndAttkToIdle + +AgonistWalking: + playfram 0x00 + setvertpos 0 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2290 Zonguard (cm\askosi\zonguard.grp) +.headerstart +IsId 47 +Type 13 +Init ZonguardInit +Death ZonguardDeath +GndAttkInit ZonguardGndAttkInit +AirAttkInit ZonguardGndAttkInit +Unused1 ZonguardUnused1 +GndAttkRpt ZonguardGndAttkInit +AirAttkRpt ZonguardGndAttkInit +CastSpell [NONE] +GndAttkToIdle ZonguardGndAttkToIdle +AirAttkToIdle ZonguardGndAttkToIdle +Unused2 [NONE] +Walking ZonguardWalking +WalkingToIdle ZonguardGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ZonguardInit: + imgulnextid 0 7 # Zonguard Shadow (cm\askosi\zonguard.grp) + playfram 0x00 + goto ZonguardGndAttkToIdle + +ZonguardGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ZonguardGndAttkToIdle + +ZonguardDeath: + playsnd 353 # Terran\Zonguard\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 + +ZonguardUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Zonguard revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto ZonguardGndAttkToIdle + +ZonguardGndAttkInit: + wait 1 + attackwith 1 + attackwith 1 + gotorepeatattk + goto ZonguardGndAttkToIdle + +ZonguardWalking: + playfram 0x00 + setvertpos 0 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/unit/cm/askosi/agonist.grp b/mpq/unit/cm/askosi/agonist.grp new file mode 100644 index 00000000..70e55b74 Binary files /dev/null and b/mpq/unit/cm/askosi/agonist.grp differ diff --git a/mpq/unit/cm/askosi/iconoclast.grp b/mpq/unit/cm/askosi/iconoclast.grp new file mode 100644 index 00000000..d6e7996f Binary files /dev/null and b/mpq/unit/cm/askosi/iconoclast.grp differ diff --git a/mpq/unit/cm/askosi/paraclete.grp b/mpq/unit/cm/askosi/paraclete.grp new file mode 100644 index 00000000..0327861a Binary files /dev/null and b/mpq/unit/cm/askosi/paraclete.grp differ diff --git a/mpq/unit/cm/askosi/zonguard.grp b/mpq/unit/cm/askosi/zonguard.grp new file mode 100644 index 00000000..355f3903 Binary files /dev/null and b/mpq/unit/cm/askosi/zonguard.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 958e310b..9e868337 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 f54876dc..b5319096 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 4d07db59..ee9567f6 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 666f4fac..a1546396 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 11caa798..407baf4e 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ