diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 8b64ad07..961e9aea 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 f35704f4..cfebf599 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -669,7 +669,7 @@ Broadside Broadside Turret Ecclesiast (Astral) Ajax -Extended Flingy #463 +Dorminge Extended Flingy #464 Extended Flingy #465 Extended Flingy #466 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 33391c27..9c0611ea 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 304fc0ba..f5cb8ad9 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 90a79d75..b9675dcd 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2322,8 +2322,8 @@ Broadside Shadow Broadside Turret Ecclesiast (Astral) Ecclesiast (Astral) Shadow -Extended Image #1322 -Extended Image #1323 +Dorminge +Dorminge Shadow Extended Image #1324 Extended Image #1325 Extended Image #1326 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 2578c676..c24f2aeb 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 33746dbf..05cc39fc 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1124,7 +1124,7 @@ Cutlass Turret Broadside Broadside Turret Ecclesiast (Astral Omen) -Extended Sprite #610 +Dorminge Extended Sprite #611 Extended Sprite #612 Extended Sprite #613 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a0222b5a..38e81fe1 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 a31fe976..f7aa01a2 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -575,7 +575,7 @@ Terran Maverick (Upstart) Protoss Ecclesiast (Astral) Terran Eidolon (Upstart) Terran Ajax (Futurist) -Extended Unit #350 +Askosi Dorminge Extended Unit #351 Extended Unit #352 Extended Unit #353 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index f6ecf2b5..a4c81c1d 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 f6da22a9..96cc7505 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 6a8be731..d70648d6 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 81f048fc..b6bda998 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -359,7 +359,7 @@ s<1><4>Morph into Protathalor <1>(<3>S<1>)<10>Mobile artillery strain.<0> <0> <0> <0> -<0> +¤<3><4>Crushing Delivery <2>(passive)<10>Enemy combatants within 8 range of the Dorminge find their movement speed slowed by 33%.<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> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 9a68bffe..7808ba4f 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 deb5b1fa..316cad3c 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 4c389639..9c18c909 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -4295,6 +4295,7 @@ ZonguardUnused1: ZonguardGndAttkInit: wait 1 nobrkcodestart + imgol 1820 0 0 # Architect weaponfire channel attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 3 nobrkcodeend @@ -4672,6 +4673,88 @@ AuxineSpecialState1: playfram 0x00 wait 12 goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2324 Dorminge (cm\askosi\dorminge.grp) +.headerstart +IsId 56 +Type 24 +Init DormingeInit +Death DormingeDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle DormingeIsWorking +SpecialState1 DormingeSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt DormingeAlmostBuilt +Built DormingeBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking DormingeIsWorking +WorkingToIdle DormingeBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable DormingeDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +DormingeInit: + playfram 0x00 + imgulnextid 0 0 # Dorminge Shadow (cm\askosi\dorminge-shadow.grp) + goto DormingeIsWorking + +DormingeDeath: + playsndbtwn 4145 4147 # Askosi explosion medium 01, 02, 03 + imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) + wait 3 + lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\askosi\a-rubble-small.grp) + wait 1 + end + +DormingeSpecialState1: + playfram 0 + goto SkryrokorLocal00 + +DormingeAlmostBuilt: + playfram 0 + goto SkryrokorLocal00 + +DormingeBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +DormingeIsWorking: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 0 + wait 2 + goto DormingeIsWorking + +DormingeDisable: + goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index f5c2e11a..50eb510e 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 77c53bee..38019e4a 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -6636,7 +6636,6 @@ ParasiteOverlayInit: playfram 8 wait 2 playfram 9 - playsnd 3239 # Rilirokor\ZBrPss02.wav wait 1 end diff --git a/mpq/unit/cm/askosi/bounty-damage.lof b/mpq/unit/cm/askosi/bounty-damage.lof index 091697d8..d0ae1962 100644 Binary files a/mpq/unit/cm/askosi/bounty-damage.lof and b/mpq/unit/cm/askosi/bounty-damage.lof differ diff --git a/mpq/unit/cm/askosi/bounty-shadow.grp b/mpq/unit/cm/askosi/bounty-shadow.grp index 9b696fc3..fd17af9f 100644 Binary files a/mpq/unit/cm/askosi/bounty-shadow.grp and b/mpq/unit/cm/askosi/bounty-shadow.grp differ diff --git a/mpq/unit/cm/askosi/bounty.grp b/mpq/unit/cm/askosi/bounty.grp index 0bea277e..ad11881b 100644 Binary files a/mpq/unit/cm/askosi/bounty.grp and b/mpq/unit/cm/askosi/bounty.grp differ diff --git a/mpq/unit/cm/askosi/dorminge-damage.lof b/mpq/unit/cm/askosi/dorminge-damage.lof new file mode 100644 index 00000000..4354d54e Binary files /dev/null and b/mpq/unit/cm/askosi/dorminge-damage.lof differ diff --git a/mpq/unit/cm/askosi/dorminge-shadow.grp b/mpq/unit/cm/askosi/dorminge-shadow.grp new file mode 100644 index 00000000..387cb287 Binary files /dev/null and b/mpq/unit/cm/askosi/dorminge-shadow.grp differ diff --git a/mpq/unit/cm/askosi/dorminge.grp b/mpq/unit/cm/askosi/dorminge.grp new file mode 100644 index 00000000..d969ebdf Binary files /dev/null and b/mpq/unit/cm/askosi/dorminge.grp differ diff --git a/mpq/unit/cm/askosi/el-harness.grp b/mpq/unit/cm/askosi/el-harness.grp new file mode 100644 index 00000000..b91e290b Binary files /dev/null and b/mpq/unit/cm/askosi/el-harness.grp differ diff --git a/mpq/unit/cm/askosi/lekrot.grp b/mpq/unit/cm/askosi/lekrot.grp new file mode 100644 index 00000000..3e36ce02 Binary files /dev/null and b/mpq/unit/cm/askosi/lekrot.grp differ diff --git a/mpq/unit/cm/askosi/lotiro-damage.lof b/mpq/unit/cm/askosi/lotiro-damage.lof new file mode 100644 index 00000000..bc416a01 Binary files /dev/null and b/mpq/unit/cm/askosi/lotiro-damage.lof differ diff --git a/mpq/unit/cm/askosi/lotiro-shadow.grp b/mpq/unit/cm/askosi/lotiro-shadow.grp new file mode 100644 index 00000000..11a38f97 Binary files /dev/null and b/mpq/unit/cm/askosi/lotiro-shadow.grp differ diff --git a/mpq/unit/cm/askosi/lotiro.grp b/mpq/unit/cm/askosi/lotiro.grp new file mode 100644 index 00000000..df9ec3a7 Binary files /dev/null and b/mpq/unit/cm/askosi/lotiro.grp differ diff --git a/mpq/unit/cm/askosi/panoply.grp b/mpq/unit/cm/askosi/panoply.grp index ae41afc3..022d4324 100644 Binary files a/mpq/unit/cm/askosi/panoply.grp and b/mpq/unit/cm/askosi/panoply.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 51725710..e7503c14 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 ba62b8c1..3943f15e 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 fac3b70d..2f5c5a7b 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -63,6 +63,14 @@ # New units +## Askosi +- [Zonguard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/zonguard): + - Tier 2 mechanized -- durable mechbeast with Preylock ability +- [Paraclete](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/paraclete): + - Tier 2 skybound -- potent skybeast with Remote Hijack ability +- [Dorminge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dorminge): + - Tier 2 infrastructure -- shrine that slows movement speed of nearby hostiles + ## Futurist Federation - [Cutlass](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cutlass): - Matador replacement with Kinetic Penetration and no deployment diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8e394a17..93bdf1b5 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ