diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 4900f21d..739b985a 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 65f2627b..3588d67b 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -617,7 +617,7 @@ Mineral Chunk (Rich) 01 Mineral Chunk (Rich) 02 Sovrokor Valkyrie (Hecaton) -Extended Flingy #411 +Garvrokor Extended Flingy #412 Extended Flingy #413 Extended Flingy #414 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 9d47a675..00f62688 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 7fdb22a8..b1d151a0 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 e4c21e81..567c038c 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2202,7 +2202,7 @@ Proselyte Remains Askosi Structure Rubble (Tiny) Sovrokor Valkyrie (Hecaton) -Extended Image #1202 +Garvrokor Extended Image #1203 Extended Image #1204 Extended Image #1205 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index cc8cdd20..b0a664e4 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 dc7e9de3..a3730f7e 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1066,7 +1066,7 @@ Proselyte Remains Askosi Structure Rubble (Tiny) Sovrokor Valkyrie (Hecaton) -Extended Sprite #552 +Garvrokor Extended Sprite #553 Extended Sprite #554 Extended Sprite #555 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index d67264e8..b618b877 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 e8ac08ed..377c4125 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -519,7 +519,7 @@ Mineral Chunk (Rich) 01 Mineral Chunk (Rich) 02 Zerg Sovrokor (Goszirith) Terran Valkyrie (Hecaton) -Extended Unit #294 +Zerg Garvrokor (Goszirith) Extended Unit #295 Extended Unit #296 Extended Unit #297 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 14c2c0e5..93d6dfbb 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 1db734cf..056735e1 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 690bdc5e..b9c1128d 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index cc41243d..06f08b4a 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 eb322d1e..73b3c65f 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 1d249d97..f268a4b0 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 f5ac033b..8f77e860 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 2219278a..ffbd6698 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -41,7 +41,7 @@ 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) +unit_morph_prerequisites = Add(sovrokor, garvrokor, 1) unit_morph_prerequisites = Add(quazilisk, liiralisk, 1) unit_morph_prerequisites = Add(quazrokor, liiralisk, 1) unit_morph_prerequisites = Add(nathrokor, kalkalisk, 1) @@ -95,7 +95,7 @@ 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) +morph_train_ai = Add(sovrokor, garvrokor) morph_train_ai = Add(quazilisk, liiralisk) morph_train_ai = Add(quazrokor, liiralisk) morph_train_ai = Add(nathrokor, kalkalisk) diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 2f34f3ba..0bf5c74c 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 4e79d5dd..806b788b 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -12833,7 +12833,7 @@ PositronUnused1: goto PositronWalkingToIdle PositronGndAttkInit: - playfram 0x11 + playfram 0x20 playsndbtwn 2172 2173 # Positron weaponfire 01, 02 attackwith 1 wait 2 diff --git a/mpq/unit/cm/faction-z/garvrokor.grp b/mpq/unit/cm/faction-z/garvrokor.grp new file mode 100644 index 00000000..62786553 Binary files /dev/null and b/mpq/unit/cm/faction-z/garvrokor.grp differ diff --git a/mpq/unit/cm/protoss/positron-attack.lol b/mpq/unit/cm/protoss/positron-attack.lol index 92e0e423..4f35df10 100644 Binary files a/mpq/unit/cm/protoss/positron-attack.lol and b/mpq/unit/cm/protoss/positron-attack.lol differ diff --git a/mpq/unit/cm/protoss/positron-shadow.grp b/mpq/unit/cm/protoss/positron-shadow.grp new file mode 100644 index 00000000..40be26ea Binary files /dev/null and b/mpq/unit/cm/protoss/positron-shadow.grp differ diff --git a/mpq/unit/cm/protoss/positron.grp b/mpq/unit/cm/protoss/positron.grp index 4d565630..80c13ce9 100644 Binary files a/mpq/unit/cm/protoss/positron.grp and b/mpq/unit/cm/protoss/positron.grp differ diff --git a/mpq/unit/cm/protoss/unar-attack.lol b/mpq/unit/cm/protoss/unar-attack.lol new file mode 100644 index 00000000..65ad5f63 Binary files /dev/null and b/mpq/unit/cm/protoss/unar-attack.lol differ diff --git a/mpq/unit/cm/protoss/unar-shadow.grp b/mpq/unit/cm/protoss/unar-shadow.grp index 8801863a..bdcfd896 100644 Binary files a/mpq/unit/cm/protoss/unar-shadow.grp and b/mpq/unit/cm/protoss/unar-shadow.grp differ diff --git a/mpq/unit/cm/protoss/unar.grp b/mpq/unit/cm/protoss/unar.grp index 645148ba..fec94dd5 100644 Binary files a/mpq/unit/cm/protoss/unar.grp and b/mpq/unit/cm/protoss/unar.grp differ diff --git a/mpq/unit/cm/terran/ancile-engines.grp b/mpq/unit/cm/terran/ancile-engines.grp index c3872561..6eb8f95d 100644 Binary files a/mpq/unit/cm/terran/ancile-engines.grp and b/mpq/unit/cm/terran/ancile-engines.grp differ diff --git a/mpq/unit/cm/terran/ancile.grp b/mpq/unit/cm/terran/ancile.grp index 161cc981..3c50a207 100644 Binary files a/mpq/unit/cm/terran/ancile.grp and b/mpq/unit/cm/terran/ancile.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 863ffec7..14c1a644 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 ee6df9c1..09cc27e3 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/bunker-attack-blue.grp b/mpq/unit/terran/anchor-attack-blue.grp similarity index 100% rename from mpq/unit/terran/bunker-attack-blue.grp rename to mpq/unit/terran/anchor-attack-blue.grp diff --git a/mpq/unit/terran/bunker-attack-green.grp b/mpq/unit/terran/anchor-attack-green.grp similarity index 100% rename from mpq/unit/terran/bunker-attack-green.grp rename to mpq/unit/terran/anchor-attack-green.grp diff --git a/mpq/unit/terran/bunker-attack-orange.grp b/mpq/unit/terran/anchor-attack-orange.grp similarity index 100% rename from mpq/unit/terran/bunker-attack-orange.grp rename to mpq/unit/terran/anchor-attack-orange.grp diff --git a/mpq/unit/terran/bunker.lof b/mpq/unit/terran/anchor-damage.lof similarity index 100% rename from mpq/unit/terran/bunker.lof rename to mpq/unit/terran/anchor-damage.lof diff --git a/mpq/unit/terran/bunker-shad.grp b/mpq/unit/terran/anchor-shadow.grp similarity index 100% rename from mpq/unit/terran/bunker-shad.grp rename to mpq/unit/terran/anchor-shadow.grp diff --git a/mpq/unit/terran/bunker.grp b/mpq/unit/terran/anchor.grp similarity index 100% rename from mpq/unit/terran/bunker.grp rename to mpq/unit/terran/anchor.grp diff --git a/mpq/unit/terran/bunker.loa b/mpq/unit/terran/anchor.loa similarity index 100% rename from mpq/unit/terran/bunker.loa rename to mpq/unit/terran/anchor.loa diff --git a/mpq/unit/terran/scv.grp b/mpq/unit/terran/mason.grp similarity index 100% rename from mpq/unit/terran/scv.grp rename to mpq/unit/terran/mason.grp diff --git a/mpq/unit/terran/scv.loo b/mpq/unit/terran/mason.loo similarity index 100% rename from mpq/unit/terran/scv.loo rename to mpq/unit/terran/mason.loo diff --git a/mpq/unit/terran/phalanx-siege-attack.lol b/mpq/unit/terran/phalanx-siege-attack.lol new file mode 100644 index 00000000..48ece4fe Binary files /dev/null and b/mpq/unit/terran/phalanx-siege-attack.lol differ diff --git a/mpq/unit/terran/tstshad.grp b/mpq/unit/terran/phalanx-siege-shadow.grp similarity index 100% rename from mpq/unit/terran/tstshad.grp rename to mpq/unit/terran/phalanx-siege-shadow.grp diff --git a/mpq/unit/terran/stankt.grp b/mpq/unit/terran/phalanx-siege-turret.grp similarity index 100% rename from mpq/unit/terran/stankt.grp rename to mpq/unit/terran/phalanx-siege-turret.grp diff --git a/mpq/unit/terran/stank.grp b/mpq/unit/terran/phalanx-siege.grp similarity index 100% rename from mpq/unit/terran/stank.grp rename to mpq/unit/terran/phalanx-siege.grp diff --git a/mpq/unit/terran/stankt.loa b/mpq/unit/terran/phalanx-siege.loa similarity index 100% rename from mpq/unit/terran/stankt.loa rename to mpq/unit/terran/phalanx-siege.loa diff --git a/mpq/unit/terran/tank.lol b/mpq/unit/terran/phalanx-tank-attack.lol similarity index 100% rename from mpq/unit/terran/tank.lol rename to mpq/unit/terran/phalanx-tank-attack.lol diff --git a/mpq/unit/terran/ttashad.grp b/mpq/unit/terran/phalanx-tank-shadow.grp similarity index 100% rename from mpq/unit/terran/ttashad.grp rename to mpq/unit/terran/phalanx-tank-shadow.grp diff --git a/mpq/unit/terran/tankt.grp b/mpq/unit/terran/phalanx-tank-turret.grp similarity index 100% rename from mpq/unit/terran/tankt.grp rename to mpq/unit/terran/phalanx-tank-turret.grp diff --git a/mpq/unit/terran/tank.grp b/mpq/unit/terran/phalanx-tank.grp similarity index 100% rename from mpq/unit/terran/tank.grp rename to mpq/unit/terran/phalanx-tank.grp diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index b4246770..70dc8a44 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 1c6deca1..ca882436 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 a3ef6d3c..e7ed3111 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -20,6 +20,7 @@ - **Gameplay:** - Misc target priority bugs have been more robustly fixed (c. DF) - Fixed weapon range bonuses being improperly rounded (r. jakulangski, c. Veeq7) + - Fixed debuff inheritence with **Agrileth**s (r. GreenEggs'NSpam) - Turreted units like the **Goliath** can no longer have wobbly turrets after unloading from Anchors (r. Vilius, c. DF) - Control groups featuring **Agrileth**s are now properly preserved when making **Eskigant**s and **Excisant**s (r. mixu) - Fixed **Gosvileths** being unable to mutate into **Kethraj Keep** (r. GreenEggs'NSpam) @@ -45,7 +46,11 @@ - [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops): - HP 95 » 110 - [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman): - - HP 120 » 150 + - HP 120 » 140 +- [Madcap](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madcap): + - HP 80 » 90 + - **Danaan Autogun:** + - Damage 7 » 8 - [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath): - Build time 25 » 22 - HP 200 » 240 @@ -65,6 +70,12 @@ ## Protoss - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): - HP 60 » 75 +- [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth): + - HP 120 » 140 +- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald): + - HP 160 » 180 +- [Atreus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/atreus): + - Shields 80 » 100 - [Vagrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/vagrant): - HP 80 » 100 - *Also applies to Vagrant Shade* @@ -73,20 +84,61 @@ - [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora): - HP 80 » 90 - Shields 35 » 45 +- [Panoptus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/panoptus): + - HP 150 » 160 + - Shields 70 » 80 ## Zerg - [Zethrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zethrokor): - HP 40 » 50 - [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor): - - HP 75 » 90 + - Resource costs 75/50 » 50/50 + - HP 75 » 85 - [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk): - HP 90 » 115 +- [Protathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/protathalor): + - Resource costs 100/75 » 125/50 +- [Mutalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mutalisk): + - Resource costs 150/100 » 100/100 + - HP 140 » 120 + - Armor 1 » 2 +- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk): + - Resource costs 75/25 » 50/25 + - HP 95 » 85 + - Movement speed 6.4 » 6.8 + - **Needle Spines:** + - Damage 10 » 8 +- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): + - Resource costs 100/0 » 75/0 + - **Energized Bioplasma:** + - Damage 7 » 5 - [Bactalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/bactalisk): - Movement speed 4 » 3.6 + - **Corrosive Acid:** + - Attack speed 1.25 » 1.5 - [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor): - HP 140 » 160 +- [Kagralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kagralisk): + - **Repeating Venom:** + - Weapon range 6 » 7 +- [Evigrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/evigrilisk): + - HP 280 » 350 +- [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk): + - HP 600 » 800 +- [Algoztalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/algoztalisk): + - HP 170 » 200 +- [Lakizilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/lakizilisk): + - Resource costs 100/75 » 75/75 + - HP 150 » 130 + - **Subterranean Spines:** + - Damage 15 » 12 +- [Zobriolisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zobriolisk): + - **Rapid Spines:** + - Weapon range 7 » 8 - **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! - **NEW:** [Sovrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sovrokor): - - Factional replacement of the **Zethrokor**, for the **Goszirith Tendril** \ No newline at end of file + - Factional replacement of the **Zethrokor**, for the **Goszirith Tendril** +- **NEW:** [Garvrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/garvrokor): + - Factional replacement of the **Vorvrokor**, for the **Goszirith Tendril** \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 6af3dc2a..ea03d534 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ