diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 930c6bf4..c8e00943 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 63295cac..bd4ff6ba 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 4f666674..ef37d081 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2184,8 +2184,8 @@ Azanthrokor Azanthrokor Shadow Bounty Bounty Shadow -Extended Image #1184 -Extended Image #1185 +Azanthrokor Birth +Azanthrokor Mutate Extended Image #1186 Extended Image #1187 Extended Image #1188 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 0c41125b..ba79a8de 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 7815aebc..d1bfa227 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 99bbadef..b0afe48d 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 dd78a45e..0375d011 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -211,7 +211,7 @@ Quarternary Rifle (Auriel) Phase Blade (Adherent) Signaling Spores (Nathrelisk) Bottomless Spinestacks (Algoztalisk) -Relentless Tendrils (Okrimnilisk) +Azanthrok Spew (Azanthrokor) Omnispores (Okrimnilisk) Venemous Bursts (Cherbrathalor) Angeltear Rockets (Salamander) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index b8e475f6..70fa6624 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 18f9c820..70d59e04 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 c761923e..29ae4507 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 12eec995..b5a14c64 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 08a7e0ba..7cfcece2 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 39a037e1..2219278a 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -62,6 +62,7 @@ unit_morph_prerequisites = Add(zoryusthaleth, ultrokor, 1) unit_morph_prerequisites = Add(inzorthrokor, ultrokor, 1) unit_morph_prerequisites = Add(lakizilisk, zobriolisk, 1) unit_morph_prerequisites = Add(gorgrokor, zarcavrokor, 1) +unit_morph_prerequisites = Add(azanthrokor, zarcavrokor, 1) # equivalent_ids = Add(hachirosk, gathtelosk) equivalent_ids = Remove(caphrolosk, gathtelosk) @@ -116,6 +117,7 @@ morph_train_ai = Add(zoryusthaleth, ultrokor) morph_train_ai = Add(inzorthrokor, ultrokor) morph_train_ai = Add(lakizilisk, zobriolisk) morph_train_ai = Add(gorgrokor, zarcavrokor) +morph_train_ai = Add(azanthrokor, zarcavrokor) # egg = Remove(97) # 97 = lurker_egg diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index a68e72cd..a83253f1 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -76,6 +76,7 @@ military quazrokor = 422 military lakizilisk_zorthos = 425 military hydralisk_orkoti = 436 building yblyleth = 438 +military azanthrokor = 511 # Terran military units military maverick = 0 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 79eea0c6..00695e29 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 2bb04d2d..90c64471 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 17d7b850..713226b0 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -17330,4 +17330,96 @@ IziraliskUnburrow: wait 1 sigorder 4 setfldirect 14 - goto IziraliskGndAttkToIdle \ No newline at end of file + goto IziraliskGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2182 Azanthrokor (cm\faction-z\azanthrokor.grp) +.headerstart +IsId 835 +Type 12 +Init AzanthrokorInit +Death AzanthrokorDeath +GndAttkInit AzanthrokorGndAttkInit +AirAttkInit AzanthrokorGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt AzanthrokorGndAttkInit +AirAttkRpt AzanthrokorGndAttkInit +CastSpell SkryrokorLocal00 +GndAttkToIdle AzanthrokorGndAttkToIdle +AirAttkToIdle AzanthrokorGndAttkToIdle +Unused2 [NONE] +Walking AzanthrokorWalking +WalkingToIdle AzanthrokorGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AzanthrokorInit: + imgul 2183 0 42 # Azanthrokor Shadow (cm\faction-z\azanthrokor.grp) + playfram 0x00 + wait 2 +AzanthrokorGndAttkToIdle: + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 + playfram 0x44 + wait 2 + playfram 0x55 + wait 2 + playfram 0x00 + wait 2 + goto AzanthrokorGndAttkToIdle + +AzanthrokorDeath: + playsnd 878 # Zerg\Ultra\ZUlDth00.WAV + imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) + wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small + wait 1 + end + +AzanthrokorGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x11 + wait 1 + playfram 0x22 + playsndbtwn 1889 1890 # Azanthrokor attack 01, 02 + imgoluselo 2056 0 0 # Green projection attack + attkshiftproj 24 + wait 1 + playfram 0x11 + attkshiftproj 54 + wait 1 + playfram 0x22 + attkshiftproj 80 + wait 1 + playfram 0x11 + attkshiftproj 108 + sigorder 32 + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + goto AzanthrokorGndAttkToIdle + +AzanthrokorWalking: + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x00 + wait 1 + goto AzanthrokorWalking \ No newline at end of file diff --git a/mpq/unit/cm/faction-z/azanthrokor-attack.lol b/mpq/unit/cm/faction-z/azanthrokor-attack.lol new file mode 100644 index 00000000..1f28b240 Binary files /dev/null and b/mpq/unit/cm/faction-z/azanthrokor-attack.lol differ diff --git a/mpq/unit/cm/faction-z/azanthrokor-birth.grp b/mpq/unit/cm/faction-z/azanthrokor-birth.grp new file mode 100644 index 00000000..9a6b555b Binary files /dev/null and b/mpq/unit/cm/faction-z/azanthrokor-birth.grp differ diff --git a/mpq/unit/cm/faction-z/azanthrokor-mutate.grp b/mpq/unit/cm/faction-z/azanthrokor-mutate.grp new file mode 100644 index 00000000..eedba735 Binary files /dev/null and b/mpq/unit/cm/faction-z/azanthrokor-mutate.grp differ diff --git a/mpq/unit/cm/zerg/kethrostalor-birth.grp b/mpq/unit/cm/zerg/kethrostalor-birth.grp new file mode 100644 index 00000000..344d8c77 Binary files /dev/null and b/mpq/unit/cm/zerg/kethrostalor-birth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 0a1785f7..9c16797c 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 eb4de06b..b3d60e8e 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 614cfea8..8f893d51 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -32,6 +32,14 @@ ## Protoss - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): - HP 60 » 75 +- [Vagrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/vagrant): + - HP 80 » 100 + - *Also applies to Vagrant Shade* +- [Cabalist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cabalist): + - Shields 30 » 60 +- [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora): + - HP 80 » 90 + - Shields 35 » 45 ## Zerg - [Zethrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zethrokor): @@ -43,4 +51,7 @@ - [Bactalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/bactalisk): - Movement speed 4 » 3.6 - [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor): - - HP 140 » 160 \ No newline at end of file + - HP 140 » 160 +- **NEW:** [Azanthrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/azanthrokor): + - Factional replacement of the **Gorgrokor**, for the **Orkoti Tendril** + - Bountied by Lucifirius! \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 18bd4585..cd5c40bb 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ