diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 961e9aea..c3d8fb34 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 cfebf599..5cb85467 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -670,9 +670,9 @@ Broadside Turret Ecclesiast (Astral) Ajax Dorminge -Extended Flingy #464 -Extended Flingy #465 -Extended Flingy #466 +Domain +Panoply +Lotiro Extended Flingy #467 Extended Flingy #468 Extended Flingy #469 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 0af776a5..8381cc83 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 4527ec8a..9f4ab405 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 f997ab4b..de064018 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2325,12 +2325,12 @@ Ecclesiast (Astral) Shadow Dorminge Dorminge Shadow Warring Winds Overlay -Extended Image #1325 -Extended Image #1326 -Extended Image #1327 -Extended Image #1328 -Extended Image #1329 -Extended Image #1330 +Domain +Domain Shadow +Panoply +Panoply Shadow +Lotiro +Lotiro Shadow Extended Image #1331 Extended Image #1332 Extended Image #1333 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index c24f2aeb..76af1c7f 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 05cc39fc..8897300a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1125,9 +1125,9 @@ Broadside Broadside Turret Ecclesiast (Astral Omen) Dorminge -Extended Sprite #611 -Extended Sprite #612 -Extended Sprite #613 +Domain +Panoply +Lotiro Extended Sprite #614 Extended Sprite #615 Extended Sprite #616 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index bdb74aad..719b06c7 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 1ff5800d..3c456148 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -577,7 +577,7 @@ Terran Eidolon (Upstart) Terran Ajax (Futurist) Askosi Dorminge Askosi Lotiro -Askosi Eminence +Askosi Domain Terran Maverick (Golden) Terran Shaman (Support, Upstart) Terran Shaman (Adrenaline, Upstart) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index d726f120..9ad1851c 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 96cc7505..2a08f707 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index e1277dc0..c943840b 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -972,9 +972,9 @@ Must target units with no hijackers.<0> ¤<3><4>Avenging Mitosis <2>(passive)<10>Upon taking damage, this strain incubates, spawning one Skryrokor after a two-second delay.<10>This status cannot be applied if the strain is already incubating.<0> w<1><4>Install Dorminge <1>(<3>W<1>)<10>Impeding shrine.<0> Dorminge requires:<10> Cipher AND Gauntlet<0> -<0> -<0> -<0> +w<1><4>Install Domain <1>(<3>C<1>)<10>Encompassing town center.<0> +Domain requires:<10> Conduit AND Bestiary<0> +¤<3><4>Earthly Profusion <2>(passive)<10>Every 10 seconds, the Domain harvests all available resource nodes within 12 range. This does not interrupt active mining efforts.<0> <0> <0> <0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 6219939b..63a99ef3 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 85591bb2..2c51fd2f 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 5acf2d8c..219d0981 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -4848,6 +4848,200 @@ WarringWindsInit: WarringWindsDeath: wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2327 Domain (cm\askosi\domain.grp) +.headerstart +IsId 58 +Type 21 +Init DomainInit +Death DomainDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt SkryrokorLocal00 +Built DomainBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking DomainIsWorking +WorkingToIdle DomainWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +DomainInit: + imgulnextid 0 0 # Domain Shadow (cm\askosi\domain-shadow.grp) +DomainWorkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +DomainDeath: + playsndbtwn 4148 4150 # Askosi explosion large 01, 02, 03 + imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) + wait 3 + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + wait 1 + end + +DomainBuilt: + imgol 1820 0 0 # Architect weaponfire channel + goto SkryrokorLocal00 + +DomainIsWorking: + imgol 1820 0 0 # Architect weaponfire channel + wait 120 + goto DomainIsWorking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2075 Panoply (cm\askosi\panoply.grp) +.headerstart +IsId 59 +Type 24 +Init PanoplyInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 PanoplySpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt PanoplyAlmostBuilt +Built PanoplyBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking PanoplyIsWorking +WorkingToIdle PanoplyBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable PanoplyDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +PanoplyInit: + playfram 0x00 + imgulnextid 0 0 # Panoply Shadow (cm\askosi\panoply-shadow.grp) + goto SkryrokorLocal00 + +PanoplySpecialState1: + playfram 0 + goto SkryrokorLocal00 + +PanoplyAlmostBuilt: + playfram 4 + goto SkryrokorLocal00 + +PanoplyBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +PanoplyIsWorking: + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 2 + wait 1 + playfram 1 + wait 1 + playfram 0 + wait 2 + goto PanoplyIsWorking + +PanoplyDisable: + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2075 Lotiro (cm\askosi\lotiro.grp) +.headerstart +IsId 60 +Type 24 +Init LotiroInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 LotiroSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt LotiroAlmostBuilt +Built LotiroBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking LotiroIsWorking +WorkingToIdle LotiroBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable LotiroDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +LotiroInit: + playfram 0x00 + imgulnextid 0 0 # Lotiro Shadow (cm\askosi\lotiro-shadow.grp) + goto SkryrokorLocal00 + +LotiroSpecialState1: + playfram 0 + goto SkryrokorLocal00 + +LotiroAlmostBuilt: + playfram 0 + goto SkryrokorLocal00 + +LotiroBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +LotiroIsWorking: + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 0 + wait 2 + goto LotiroIsWorking + +LotiroDisable: + goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/a/akreno.grp b/mpq/unit/cm/a/akreno.grp index e0f014bb..aa89c2a2 100644 Binary files a/mpq/unit/cm/a/akreno.grp and b/mpq/unit/cm/a/akreno.grp differ diff --git a/mpq/unit/cm/a/eminence-damage.lof b/mpq/unit/cm/a/domain-damage.lof similarity index 100% rename from mpq/unit/cm/a/eminence-damage.lof rename to mpq/unit/cm/a/domain-damage.lof diff --git a/mpq/unit/cm/a/eminence-shadow.grp b/mpq/unit/cm/a/domain-shadow.grp similarity index 100% rename from mpq/unit/cm/a/eminence-shadow.grp rename to mpq/unit/cm/a/domain-shadow.grp diff --git a/mpq/unit/cm/a/eminence.grp b/mpq/unit/cm/a/domain.grp similarity index 100% rename from mpq/unit/cm/a/eminence.grp rename to mpq/unit/cm/a/domain.grp diff --git a/mpq/unit/cm/a/panoply-damage.lof b/mpq/unit/cm/a/panoply-damage.lof new file mode 100644 index 00000000..6a94689f Binary files /dev/null and b/mpq/unit/cm/a/panoply-damage.lof differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 32e3d9f4..ce80835d 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 4582e859..4177121a 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 df1e98ea..8f2eaf8b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ