diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 23f8dcf4..bc38e909 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 bbe18a69..64a345d5 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -560,7 +560,7 @@ Hydralisk (Orkoti) Tencendur Inzorthrokor Manifold (Starbound) -Extended Flingy #354 +Yblyleth Extended Flingy #355 Extended Flingy #356 Extended Flingy #357 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 8639f4bc..3de56fcc 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 2ee32257..a6f3963d 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 c7e1c62d..0a279322 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2028,11 +2028,11 @@ Inzorthrokor Remains Inzorthrokor Birth Manifold (Starbound) Manifold Shadow (Starbound) -Extended Image #1028 -Extended Image #1029 -Extended Image #1030 -Extended Image #1031 -Extended Image #1032 +Yblyleth +Yblyleth Shadow +Yblyleth Remains +Yblyleth Birth +Yblyleth Mutate Extended Image #1033 Extended Image #1034 Extended Image #1035 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 465cfa4f..88f4c38f 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 9e3628c4..ae1e0e5e 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -996,7 +996,7 @@ Hydralisk Remains (Orkoti) Inzorthrokor Inzorthrokor Remains Manifold (Starbound) -Extended Sprite #1 +Yblyleth Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 61e5647c..ca1ef5d6 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 14db3407..e607a8e1 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -436,7 +436,7 @@ Tiangou Turret Terran Maverick (Futurist) Zerg Hydralisk (Orkoti) Protoss Manifold (Starbound) -Extended Unit #211 +Zerg Yblyleth (Zorthos) Extended Unit #212 Extended Unit #213 Extended Unit #214 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index f88181ad..b81d5298 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index e3cd7510..86c146b5 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index fcca9812..adffaf1a 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 28fd841c..a90c9d93 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 c9a86d31..ecbd46a9 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 7b90b5ef..661689d5 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 b747b3f4..10ad639e 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -38,6 +38,7 @@ ai_nydus_move = true # unit_morph_prerequisites = Add(droleth, gosvileth, 1) unit_morph_prerequisites = Add(ovileth, iroleth, 1) +unit_morph_prerequisites = Add(yblyleth, iroleth, 1) unit_morph_prerequisites = Add(othstoleth, alaszileth, 1) unit_morph_prerequisites = Add(zethrokor, vorvrokor, 1) unit_morph_prerequisites = Add(zethrokor, gorvrokor, 1) @@ -88,6 +89,7 @@ equivalent_ids = Add(zorkiz_shroud, ultrav_cavern) # morph_train_ai = Add(droleth, gosvileth) morph_train_ai = Add(ovileth, iroleth) +morph_train_ai = Add(yblyleth, iroleth) morph_train_ai = Add(othstoleth, alaszileth) morph_train_ai = Add(zethrokor, vorvrokor) morph_train_ai = Add(zethrokor, gorvrokor) diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 99349e45..e4deb555 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -72,6 +72,7 @@ military inzorthrokor = 415 military quazrokor = 422 military lakizilisk_zorthos = 425 military hydralisk_orkoti = 436 +military yblyleth = 438 # Terran military units military maverick = 0 diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 52e6d25f..5639edcf 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -29510,7 +29510,7 @@ WarpIn LanifectWarpIn # ----------------------------------------------------------------------------- # ArchitectInit: - imgul 1220 0 14 # Architect Shadow (cm\protoss\architect.grp) + imgul 1220 0 0 # Architect Shadow (cm\protoss\architect.grp) ArchitectGndAttkToIdle: playfram 0x00 goto ArchitectWalkingToIdle @@ -29537,8 +29537,10 @@ ArchitectGndAttkInit: imgol 1820 0 0 # Architect charge overlay wait 8 playsndbtwn 1413 1415 # Architect weapon fire 01, 02, 03 + playfram 0x20 attackwith 1 wait 2 + playfram 0x00 nobrkcodeend gotorepeatattk goto ScourgeLocal00 diff --git a/mpq/unit/cm/architect-attack.lol b/mpq/unit/cm/architect-attack.lol new file mode 100644 index 00000000..a6626917 Binary files /dev/null and b/mpq/unit/cm/architect-attack.lol differ diff --git a/mpq/unit/cm/faction-z/yblyleth-shadow.grp b/mpq/unit/cm/faction-z/yblyleth-shadow.grp new file mode 100644 index 00000000..bfc789bf Binary files /dev/null and b/mpq/unit/cm/faction-z/yblyleth-shadow.grp differ diff --git a/mpq/unit/cm/faction-z/yblyleth.grp b/mpq/unit/cm/faction-z/yblyleth.grp new file mode 100644 index 00000000..a13162cb Binary files /dev/null and b/mpq/unit/cm/faction-z/yblyleth.grp differ diff --git a/mpq/unit/cm/protoss/architect-attack.lol b/mpq/unit/cm/protoss/architect-attack.lol new file mode 100644 index 00000000..d6c39b90 Binary files /dev/null and b/mpq/unit/cm/protoss/architect-attack.lol differ diff --git a/mpq/unit/cm/protoss/architect-engine.grp b/mpq/unit/cm/protoss/architect-engine.grp index 9f270851..086057fa 100644 Binary files a/mpq/unit/cm/protoss/architect-engine.grp and b/mpq/unit/cm/protoss/architect-engine.grp differ diff --git a/mpq/unit/cm/protoss/architect-shadow.grp b/mpq/unit/cm/protoss/architect-shadow.grp new file mode 100644 index 00000000..22d94dec Binary files /dev/null and b/mpq/unit/cm/protoss/architect-shadow.grp differ diff --git a/mpq/unit/cm/protoss/architect.grp b/mpq/unit/cm/protoss/architect.grp index 90e7da31..a8edc587 100644 Binary files a/mpq/unit/cm/protoss/architect.grp and b/mpq/unit/cm/protoss/architect.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 7ede496e..fc311184 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 057c52b8..283067d7 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 781f995b..a2c8c015 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 280f9155..9aac74f8 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 750c4f6e..0970688f 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -20,6 +20,41 @@ Our goals for the next patch (5 April 2025) include: - Use Protoss cloaking SFX for **Vibrance** (r. lolrsk8s) - Fix **Gorgon** passive tooltip (r. Bashka91) +## Audiovisuals: +- New model for: + - Architect (c. DeltaCadimus) + +## Terran +- [Vestry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vestry): + - Build time 20 » 15 +- [Covenant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/covenant): + - Build time 25 » 22 +- [Tinkerer's Tower](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tinkerers-tower): + - Build time 25 » 20 +- [Guildhall](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/guildhall): + - Build time 30 » 22 +- [Palladium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/palladium): + - Build time 25 » 22 +- [Future Station](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/future-station): + - Build time 40 » 30 +- [Biotic Bastion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/biotic-bastion): + - Build time 45 » 30 +- [Rotary](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/rotary): + - Build time 25 » 20 +- [Commandment](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/commandment): + - Build time 30 » 22 +- [Hadron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/hadron): + - Build time 45 » 30 + ## Protoss +- [Accantor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/accantor): + - **Plasma Shell:** + - Weapon range 9 » 8 - [Extatus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/extatus): - - Now has **Astral Blessing**, from **Astral Tether** \ No newline at end of file + - Now has **Astral Blessing**, from **Astral Tether** +- [Ardent Authority](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ardent-authority): + - Resource costs 300/200 » 250/200 + +## Zerg +- **NEW:** [Yblyleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/yblyleth): + - Zorthos Tendril: Ovileth replacement. Ground transport strain with cagra spread & Rilirokor corpse autophagy while burrowed \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 32727d39..41af06a5 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ