diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 2e9ca634..ba579092 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index ebefac2a..001ebf0e 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2485,7 +2485,7 @@ Medkit Shadow (Carried) Battery Cell Battery Cell Shadow Battery Cell Shadow (Carried) -Extended Image #1485 +Flamethrower (Blue) Extended Image #1486 Extended Image #1487 Extended Image #1488 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 3d6d5a22..68dc91a9 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 39bcf3c1..96cf3256 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1192,7 +1192,7 @@ Shaman (Upstart, Adrenaline) Ammo Crate Medkit Battery Cell -Extended Sprite #678 +Flamethrower (Blue) Extended Sprite #679 Extended Sprite #680 Extended Sprite #681 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index cf191a33..d9d7d070 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 a7d6a943..ab0e636e 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -636,7 +636,7 @@ Forerunner Lumen Ammo Crate Medkit Battery Cell -Extended Unit #411 +Forerunner Buildings Extended Unit #412 Extended Unit #413 Extended Unit #414 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index c6490156..253ead61 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 fd7e6d85..e5407b18 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -306,7 +306,7 @@ Plasma Flurry (Gladius Order) Epitaph Grenade Launcher (Morrigan) Scalpel Cannon (Shaman Upstart) Reactive Blaster (Manifold Starbound) -Extended Weapon #179 +Plasmathrower (Harakan Golden) Extended Weapon #180 Extended Weapon #181 Extended Weapon #182 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index a9933d16..1d2e810e 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 58f275e0..3dc6bc37 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 3fb38019..f1030e41 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 ef9fd916..7b66b6db 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -424,7 +424,7 @@ Zerg Flyer Attacks<0> Protoss Ground Weapons<0> Protoss Air Weapons<0> Plasma Shields<0> -¤<3><4>Reconstitution <2>(passive)<10>2 seconds after taking direct damage, this strain releases a Carapace Swarm that lasts up to 5 seconds and absorbs up to 200 damage.<0> +¤<3><4>Reconstitution <2>(passive)<10>2 seconds after taking direct damage from hostiles, this strain releases a Carapace Swarm that lasts up to 5 seconds and absorbs up to 400 damage.<0> t<1><4>Warp in Monument of Sin <1>(<3>T<1>)<10>Capital stellar production.<0> Axtoth Axis requires:<10> Othstol Oviform<0> f<1><4>Bestow Harakan <1>(<3>F<1>)<10>Dutiful frontline infantry.<0> @@ -1112,7 +1112,7 @@ d<1><4>Train Madcap <1>(<3>D<1>)<10>Mechanized infantry.<0> g<3><4>Land Grab <1>(<3>G<1>)<10>Orders the Wyvern to fire its weapon at the target site.<0> r<1><4>Warp in Strident Stratum <1>(<3>R<1>)<10>Utilitarian production.<0> Mantle requires:<10> Atlas<0> -¤<3><4>Power Overload <2>(passive)<10>Victims of this combatant sustain 5 damage once per second for every point of armor they have.<0> +¤<3><4>Power Overload <2>(passive)<10>Victims of this combatant have their armor stolen and given to the attacker, to a maximum of 4 bonus armor.<0> r<1><4>Build Wyvern <1>(<3>R<1>)<10>Area-denial corvette.<0> v<1><4>Train Savant <1>(<3>V<1>)<10>Versatile infantry.<0> z<1><4>Build Apothecary <1>(<3>Z<1>)<10>Alchemical outpost.<0> @@ -1150,7 +1150,7 @@ Sasyrvoleth requires:<10> Axtoth Axis<0> e<1><4>Warp in Cicatus <1>(<3>E<1>)<10>Destitute skirmisher.<0> ¤<3><4>Servile Vigor <2>(passive)<10>Cohorts revive once after death, gaining a 10-second timed life. They can consume a nearby corpse to become permanent again.<0> a<1><4>Warp in Extatus <1>(<3>A<1>)<10>Stolid fighter.<0> -<0> +c<1><4>Erect Machinamentum <1>(<3>C<1>)<10>Assembly site.<0> <0> s<1><4>Assemble Oscilliant <1>(<3>S<1>)<10>Assault drone.<0> a<1><4>Assemble Unar <1>(<3>A<1>)<10>Sniper drone.<0> @@ -2304,7 +2304,7 @@ Phase Rifle<0> Plasma Flurry<0> Epitaph Grenade Launcher<0> Scalpel Cannon<0> -<0> +Plasmathrower<0> <0> <0> <0> diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 8eaddf69..8fd4413f 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index bfcb566b..b20df879 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -5183,7 +5183,7 @@ MachinamentumIsWorking: playfram 8 wait 1 playfram 0 - wait 3 + wait 5 goto MachinamentumIsWorking MachinamentumDisable: diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 4c99d859..82f0361f 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index 1f33c25e..4ed8326e 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -22051,4 +22051,184 @@ MorriganSpecialState1: wait 1 playfram 0x40 wait 1 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 226 Harakan (Golden) (cm\f-t\harakan-golden.grp) +.headerstart +IsId 857 +Type 12 +Init HarakanGoldenInit +Death HarakanGoldenDeath +GndAttkInit HarakanGoldenGndAttkInit +AirAttkInit [NONE] +Unused1 HarakanGoldenUnused1 +GndAttkRpt HarakanGoldenGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle HarakanGoldenGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking HarakanGoldenWalking +WalkingToIdle HarakanGoldenWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +HarakanGoldenInit: + imgulnextid 0 0 # Harakan (Golden) Shadow (cm\f-t\harakan-golden-shadow.grp) +HarakanGoldenWalkingToIdle: + playfram 0x40 +HarakanGoldenLocal00: + wait 63 + randcondjmp 25 HarakanGoldenLocal01 + randcondjmp 128 HarakanGoldenLocal02 + goto HarakanGoldenLocal00 + +HarakanGoldenLocal01: + playfram 0x00 + wait 1 + randcondjmp 192 HarakanGoldenLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto HarakanGoldenWalkingToIdle + +HarakanGoldenLocal03: + wait 13 + goto HarakanGoldenWalkingToIdle + +HarakanGoldenLocal02: + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + turnrand 3 + wait 1 + playfram 0x60 + wait 1 + goto HarakanGoldenWalkingToIdle + +HarakanGoldenDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + setfldirect 0 +# playfram 170 + wait 2 +# playfram 171 + wait 2 +# playfram 172 + wait 2 +# playfram 173 + wait 2 +# playfram 174 +# wait 2 +# playfram 175 +# wait 2 +# playfram 176 +# wait 2 +# playfram 177 +# wait 2 + lowsprul 615 0 0 # HarakanGolden Remnants (cm\terran\harakan-remnants.grp) + wait 1 + end + +HarakanGoldenUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 # Harakan (Golden) revive 01, 02, 03 + sprol 742 0 0 # Explosion Small Reversed +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto HarakanGoldenWalkingToIdle + +HarakanGoldenGndAttkInit: + playfram 0x00 +HarakanGoldenGndAttkRpt: + wait 1 + nobrkcodestart + imgol 2487 0 0 # Flamethrower (Blue) (thingy\flamer.grp) + playfram 0x20 + attkshiftproj 24 + sigorder 32 + wait 1 + attkshiftproj 52 + sigorder 32 + wait 1 + attkshiftproj 80 + sigorder 32 + wait 5 + playfram 0x00 + wait 2 + ignorerest +HarakanGoldenGndAttkToIdle: + goto HarakanGoldenWalkingToIdle + +HarakanGoldenWalking: + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x40 + goto HarakanGoldenWalking \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 83ecb75f..9ddcf3c6 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -17936,7 +17936,7 @@ ZethalorGndAttkInit: ZethalorGndAttkRpt: wait 1 nobrkcodestart - playsndbtwn 2014 2015 # Liiralisk attack 01, 02 + playsndbtwn 3467 3469 # Zethalor weaponfire 01, 02, 03 playfram 0x1A0 wait 1 playfram 0x1E0 diff --git a/mpq/templates/Mindshare(1).got b/mpq/templates/Mindshare(1).got new file mode 100644 index 00000000..e34a46a7 Binary files /dev/null and b/mpq/templates/Mindshare(1).got differ diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst index c4f3d8ac..39b090e8 100644 --- a/mpq/templates/templates.lst +++ b/mpq/templates/templates.lst @@ -11,4 +11,5 @@ "Dark Ages(1).got" "Deathmarch(1).got" "Brotherhood(1).got" +"Mindshare(1).got" "Debug(1).got" \ No newline at end of file diff --git a/mpq/unit/cm/f-t/blackguard.grp b/mpq/unit/cm/f-t/blackguard.grp index 283b5353..ed8a2dcf 100644 Binary files a/mpq/unit/cm/f-t/blackguard.grp and b/mpq/unit/cm/f-t/blackguard.grp differ diff --git a/mpq/unit/cm/f-t/harakan-golden-shadow.grp b/mpq/unit/cm/f-t/harakan-golden-shadow.grp index 11b9976b..3cdff38f 100644 Binary files a/mpq/unit/cm/f-t/harakan-golden-shadow.grp and b/mpq/unit/cm/f-t/harakan-golden-shadow.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index c8220e75..7e9e6143 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 20b0c9bb..965dba8c 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 09bca0ad..53f7544b 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 9540a971..e067719f 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 0511e409..93d0e7e2 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,5 +1,5 @@ -# 31 August 2026 -## Year 4, month 8, patch 2 +# 4 September 2026 +## Year 4, month 9, patch 1 ## Patch goals - Additional balance tweaks following Acropolis #4! @@ -23,6 +23,11 @@ - **A new campaign menu has been achieved!** (c. Jesse) - It's so epic... please enjoy! +## Game Modes +- **NEW: Mindshare** (b. BtyB) + - Resource pool is shared among allies! + - *Caveat: Starting resources are not yet doubled in all cases* + ## Bugfixes - **Gameplay:** - Mimicry no longer fails to account for weapon factor in many cases (r. shopkeeper dog) @@ -43,8 +48,9 @@ - Resized model for: - Talos, Cyprian - Modified model for: - - Maverick, Maverick (Futurist), Shaman, Artisan, Phontis + - Maverick, Maverick (Futurist), Shaman, Blackguard, Artisan, Phontis - Zethrokor, Liiralisk, Izirokor (c. Solstice) +- Modified weaponfire VFX for Harakan (Golden) - Added weapon launch offsets for: - Aphorist, Silversoul, Ghostwrit, Phontis, Iconoclast, Crematorium - Modified unit responses for Vorvrokor @@ -65,22 +71,33 @@ - **Stim Pack:** - HP cost 5 » 10 - [Harakan](https://cosmonarchy.com/terran/harakan): - - Build time 16 » 15 + - Build time 16 » 14 + - HP 100 » 120 - [Cyprian](https://cosmonarchy.com/terran/cyprian): - Resource costs 75/50 » 100/50 - HP 80 » 90 - Collision size increased by ~16% +- [Heracles](https://cosmonarchy.com/terran/heracles): + - HP 200 » 240 - [Vulture](https://cosmonarchy.com/terran/vulture): - Resource costs 100/0 » 75/0 - - HP 120 » 100 - - **Fragmentation Grenade:** - - Weapon damage 2x10 » 2x8 + - HP 120 » 80 - [Goliath](https://cosmonarchy.com/terran/goliath): - Mineral cost 175/50 » 150/50 - HP 240 » 220 - Movement speed 5 » 4.5 +- [Phalanx](https://cosmonarchy.com/terran/phalanx): + - Mineral cost 200/50 » 150/75 +- [Cataphract](https://cosmonarchy.com/terran/cataphract): + - **Longinius Cannons:** + - No longer target air units - [Quarry](https://cosmonarchy.com/terran/quarry): - Build time 35 » 45 +- [Anvil](https://cosmonarchy.com/terran/anvil): + - Resource costs 150/150 » 100/150 +- [Morningstar](https://cosmonarchy.com/terran/morningstar): + - Resource costs 100/100 » 50/100 + - Build time 30 » 25 - [Treasury](https://cosmonarchy.com/terran/treasury): - Build time 35 » 40 - Can now train **Mason**s while a **Quarry** is constructed. @@ -101,11 +118,13 @@ - Build time 16 » 15 - [Vulture (Upstart](https://cosmonarchy.com/terran/vulture-upstart): - Resource costs 100/0 » 75/0 - - HP 120 » 100 - - **Fragmentation Grenade:** - - Weapon damage 2x10 » 2x8 + - HP 120 » 80 - **NEW:** [Maverick (Golden)](https://cosmonarchy.com/terran/maverick-golden): - Maverick variant for Golden Republic. Has shields and a fast-firing phase rifle; no Stim Pack. +- **NEW:** [Shaman (Upstart](https://cosmonarchy.com/terran/shaman-upstart): + - Shaman variant for Upstart Terrans. Stims allies when deployed. +- **NEW:** [Morrigan](https://cosmonarchy.com/terran/morrigan): + - Eidolon replacement for Upstart Terrans. Has attack cloaking and an area-damage ground-only grenade launcher. ## Protoss - [Gateway](https://cosmonarchy.com/protoss/gateway): @@ -116,15 +135,39 @@ - **Dauntless Disruption Cannon:** - Weapon damage 12 » 10 - Weapon range 5 » 4 +- [Unar](https://cosmonarchy.com/protoss/unar): + - Resource costs 300/125 » 200/200 + - Build time 50 » 45 +- [Architect](https://cosmonarchy.com/protoss/architect): + - Resource costs 250/200 » 300/250 + - Build time 45 » 50 + - HP 200 » 240 + - Shields 50 » 40 + - **Reactive Payload:** + - Weapon cooldown 1.33 » 1.25 +- [Optecton](https://cosmonarchy.com/protoss/optecton/): + - Resource costs 500/200 » 500/300 + - HP 400 » 500 +- [Unitary Union](https://cosmonarchy.com/protoss/unitary-union): + - Resource costs 500/250 » 500/300 ## Protoss factions - **NEW:** [Gladius (Order)](https://cosmonarchy.com/protoss/gladius-order): - Order of the Sacred Saber Gladius variant. Has Triumphant Rise (a la Herald / Archon). ## Zerg +- **Reconstitution:** + - *Used by Agrileth (new), Vilgorokor* + - Carapace Swarm HP 200 » 400 - **Miasma:** - No longer spreads on death; **Plague** remains unchanged - *This will be revisited later.* +- [Agrileth](https://cosmonarchy.com/zerg/agrileth): + - Resource costs 150/50 » 150/75 + - HP 200 » 140 + - Armor 2 » 1 + - **NEW: Reconstitution** + - Releases a Carapace Swarm upon taking damage. - [Zethrokor](https://cosmonarchy.com/zerg/zethrokor): - Resource cost 25/0 » 50/0 - HP 50 » 60 @@ -137,6 +180,16 @@ - Armor 1 » 2 - Movement speed 9.1 » 9.8 - Collision size increased by ~23% +- [Liiralisk](https://cosmonarchy.com/zerg/liiralisk): + - **Homing Spore:** + - Weapon range 7 » 8 +- [Protathalor](https://cosmonarchy.com/zerg/protathalor): + - Resource costs 125/75 » 100/100 +- [Izirokor](https://cosmonarchy.com/zerg/izirokor): + - Build time 26 » 22 +- [Bactalisk](https://cosmonarchy.com/zerg/bactalisk): + - **Corrosive Acid:** + - No longer targets air units - [Zoryusthaleth](https://cosmonarchy.com/zerg/zoryusthaleth): - Resource costs 175/0 » 200/0 - Build time 28 » 25 @@ -148,19 +201,37 @@ - **Subterranean Spines:** - Weapon damage 12 » 15 - Weapon cooldown 1.63 » 1.75 +- [Vilgorokor](https://cosmonarchy.com/zerg/vilgorokor): + - Resource costs 200/75 » 200/50 + - HP 280 » 200 ## Askosi - **Shared Designs:** - Team building from **Pilgrim**s and **Constituent**s now increases build rate by 25% per worker, from 20% - **Ash Heap:** - Now consumes corpses +- **Power Overload:** + - *Used by Grandstand, Rove (new), Intendent* + - No longer deals damage over time to armored targets + - Now steals armor, to a cap of 4 - [Cardinal](https://cosmonarchy.com/askosi/cardinal): - Resource costs 75/25 » 100/25 +- [Rove](https://cosmonarchy.com/askosi/rove): + - **Elre Scaleshot:** + - Weapon damage 8 » 4 + - Armor penetration 2 » 0 + - Weapon range 5 » 3 + - Weapon factor 1 » 3 + - Now fires in a shotgun pattern (e.g. **Hotshot**, **Siren**) + - **Impact Dissipation** removed + - **NEW: Power Overload** - [Tortare](https://cosmonarchy.com/askosi/tortare): - **Deathrattle Assembly:** - Now grants 2 armor when deployed - [Radix](https://cosmonarchy.com/askosi/radix): - Resource costs 100/0 » 125/0 +- [Function](https://cosmonarchy.com/askosi/function): + - Resource costs 125/25 » 150/25 ## Askosi factions - **NEW: Sons of Ash** diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f84b5439..231f03fd 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ