diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 61c80c2f..a3e5ab64 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 5ced94e3..66a6aa3d 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -654,8 +654,8 @@ Zethalor Scrylyleth Conduit Bestiary -Extended Flingy #448 -Extended Flingy #449 +Eyelet +Obelisk Extended Flingy #450 Extended Flingy #451 Extended Flingy #452 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 4af7272c..d9dd8c21 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 13bf1f2e..f92752f9 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 3baa953a..e4acf9d4 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2278,10 +2278,10 @@ Astrolabe Shadow Ash Heap Overlay Crematorium Crematorium Shadow -Extended Image #1278 -Extended Image #1279 -Extended Image #1280 -Extended Image #1281 +Eyelet +Eyelet Shadow +Obelisk +Obelisk Shadow Extended Image #1282 Extended Image #1283 Extended Image #1284 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 27b7ddad..96addf21 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 ed4cab06..2a4b9824 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1109,8 +1109,8 @@ Thaumalogue Remnants Zethalor Remnants Conduit Bestiary -Extended Sprite #595 -Extended Sprite #596 +Eyelet +Obelisk Extended Sprite #597 Extended Sprite #598 Extended Sprite #599 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 7275bb77..7ecfe4ff 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 8a00cac1..9f18316a 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -561,8 +561,8 @@ Zerg Zethalor (Orkoti) Zerg Scrylyleth (Zorthos) Askosi Bestiary Askosi Conduit -Askosi Thaumalogue (Embedded) -Extended Unit #337 +Askosi Obelisk +Askosi Eyelet Extended Unit #338 Extended Unit #339 Extended Unit #340 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index c5b1f4eb..3d3a6944 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 6148f643..08560db4 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index a164677f..a576655e 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 8e75c5ce..f56cd0cb 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 9c02d87b..240a2dbe 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -947,7 +947,7 @@ z<1><4>Raise Zonguard <1>(<3>Z<1>)<10>Ravenous mechbeast.<0> Phontis requires:<10> Conduit<0> Zonguard requires:<10> Bestiary<0> a<1><4>Raise Akreno <1>(<3>A<1>)<10>Light skybeast.<0> -s<1><4>Meld Meld Iconoclast <1>(<3>S<1>)<10>.<0> +s<1><4>Meld Meld Iconoclast <1>(<3>S<1>)<10>Crowd-controlling frigate.<0> c<1><4>Meld Meld Crematorium <1>(<3>C<1>)<10>Assault cruiser.<0> r<1><4>Raise Paraclete <1>(<3>R<1>)<10>Interdicting skybeast.<0> Crematorium requires:<10> Conduit<0> @@ -1072,7 +1072,7 @@ g<1><4>Build Monogram <1>(<3>G<1>)<10>Reinforcing hovercraft.<0> g<1><4>Build Gorgon <1>(<3>G<1>)<10>All-purpose corvette.<0> a<1><4>Build Salamander <1>(<3>A<1>)<10>Area-denial cruiser.<0> ¤<3><4>Signify: Cowardice <2>(passive)<10>Enemies struck by this combatant have their movement speed reduced by 50% for 3 seconds.<0> -<0> +e<3><4>Place Eyelet <1>(<3>E<1>)<10>Deploys an Eyelet at the target location. Eyelets detect hidden hostiles and can Remateralize allies.<0> ¤<3><4>Signify: Malice <2>(passive)<10>Enemies struck by 5 consecutive attacks have their attack speed reduced by 33%. This effect expires at the same time as Signify: Cowardice.<0> e<1><4>Warp in Legionnaire <1>(<3>E<1>)<10>Melee skirmisher.<0> r<1><4>Warp in Hierophant <1>(<3>R<1>)<10>Disruptive strider.<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 1a837f98..9184a17a 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 5602482a..d1f16b85 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 802f8bd2..bd3dc304 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -3716,4 +3716,204 @@ CrematoriumWalking: CrematoriumSpecialState1: playfram 0x00 wait 12 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2280 Eyelet (cm\askosi\eyelet.grp) +.headerstart +IsId 44 +Type 26 +Init EyeletInit +Death EyeletDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 EyeletUnused2 +Walking SkryrokorLocal00 +WalkingToIdle EyeletWalkingToIdle +SpecialState1 EyeletSpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow EyeletBurrow +UnBurrow EyeletUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +EyeletInit: + imgulnextid 0 -6 # Spider Mine Shadow (cm\askosi\eyelet-shadow.grp) +EyeletWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +EyeletDeath: + playsnd 10 # Misc\Explo1.wav + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0x11 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + end + +EyeletSpecialState1: + castspell + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +EyeletUnused2: + sigorder 32 + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +EyeletBurrow: + nobrkcodestart + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + sigorder 4 + nobrkcodeend + goto SkryrokorLocal00 + +EyeletUnBurrow: + nobrkcodestart + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 10 + wait 1 + playfram 9 + wait 1 + playfram 8 + wait 1 + playfram 0x00 + sigorder 4 + nobrkcodeend + goto EyeletWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2282 Obelisk (cm\askosi\obelisk.grp) +.headerstart +IsId 45 +Type 24 +Init ObeliskInit +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 ObeliskSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt ObeliskAlmostBuilt +Built ObeliskBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking ObeliskIsWorking +WorkingToIdle ObeliskBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable ObeliskDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ObeliskInit: + imgulnextid 0 0 # Obelisk Shadow (cm\askosi\obelisk-shadow.grp) + playfram 0x00 + goto SkryrokorLocal00 + +ObeliskSpecialState1: + playfram 1 + goto SkryrokorLocal00 + +ObeliskAlmostBuilt: + playfram 1 + goto SkryrokorLocal00 + +ObeliskBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +ObeliskIsWorking: + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0 + wait 1 + goto ObeliskIsWorking + +ObeliskDisable: + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index c01648c9..36f7d4d8 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index fd0e2098..11da4a9a 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -1666,19 +1666,19 @@ Death Generic_Wait1End ZealotDeathInit: setfldirect 0 - playfram 0xdd + playfram 416 wait 2 - playfram 222 + playfram 417 wait 2 - playfram 223 + playfram 418 wait 2 - playfram 224 + playfram 419 wait 2 - playfram 225 + playfram 420 wait 2 - playfram 226 + playfram 421 wait 2 - playfram 227 + playfram 422 wait 2 end @@ -11039,20 +11039,20 @@ Death Generic_Wait1End # ----------------------------------------------------------------------------- # ZealotDeathReversedInit: - playfram 227 - wait 2 - playfram 226 - wait 2 - playfram 225 - wait 2 - playfram 224 - wait 2 - playfram 223 - wait 2 - playfram 222 - wait 2 - playfram 0xdd - wait 2 + playfram 422 + wait 2 + playfram 421 + wait 2 + playfram 420 + wait 2 + playfram 419 + wait 2 + playfram 418 + wait 2 + playfram 417 + wait 2 + playfram 416 + wait 2 end # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/cm/askosi/eyelet-shadow.grp b/mpq/unit/cm/askosi/eyelet-shadow.grp new file mode 100644 index 00000000..de0e8cae Binary files /dev/null and b/mpq/unit/cm/askosi/eyelet-shadow.grp differ diff --git a/mpq/unit/cm/askosi/eyelet.grp b/mpq/unit/cm/askosi/eyelet.grp new file mode 100644 index 00000000..9bbfe127 Binary files /dev/null and b/mpq/unit/cm/askosi/eyelet.grp differ diff --git a/mpq/unit/cm/askosi/obelisk-damage.lof b/mpq/unit/cm/askosi/obelisk-damage.lof new file mode 100644 index 00000000..80b00ec1 Binary files /dev/null and b/mpq/unit/cm/askosi/obelisk-damage.lof differ diff --git a/mpq/unit/cm/askosi/obelisk-shadow.grp b/mpq/unit/cm/askosi/obelisk-shadow.grp new file mode 100644 index 00000000..2838fbb7 Binary files /dev/null and b/mpq/unit/cm/askosi/obelisk-shadow.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index db1e1a0c..958e310b 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 9fd2530c..f54876dc 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 0971db82..4d07db59 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 24cffb1d..666f4fac 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index 27d6bbbe..2194a03f 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -45,10 +45,18 @@ - Build time 70 » 75 ## Zerg +- **Bone of Reflection:** + - *Used by Tethzorokor, Zarcavrokor** + - Armor penetration 3 » 0 +- [Agrileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/agrileth): + - Transport weight 8 » 6 - [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor): - HP 240 » 220 ## Askosi +- **New arrivals:** + - T1: Eyelet (from Proselyte) + - T2: Biotic (full), Conduit, Bestiary - [Dyad](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dyad): - Resource costs 50/50 » 50/25 - [Rove](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/rove): @@ -61,6 +69,9 @@ - Armor penetration 3 » 0 - Weapon range 6 » 5 - [Helion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/helion): + - Resource costs 100/50 » 100/25 + - Build time 18 » 15 + - HP 120 » 100 - **Usko Scrapray:** - Weapon cooldown 0.63 » 0.5 - [Tirade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/tirade): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 2061f12a..5f903816 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ