diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 6d520b68..656c9d74 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 91bdffc7..5077f950 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 4336c94e..2ee32257 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 1ea6da54..78cc5e84 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/techdata.txt b/mpq/arr/techdata.txt index 8a467865..70b34fc5 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -45,7 +45,7 @@ None None Through the Looking Glass (Hypnagogue) Adaptation (Kazitrith Colony) -Extended Tech #4 +Prying Eyes (Facade) Extended Tech #5 Extended Tech #6 Lobotomy Grenade (Goska dupe) diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 2d932f8b..c783b1ad 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index cbc09ba3..4751a70d 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 db34e0d4..fcca9812 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 e03ba09e..28d05952 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 f0a55800..28fd841c 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 83ccf431..fa189008 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 0c68562d..852f207a 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -7935,7 +7935,7 @@ FulcrumLanding: wait 2 playfram 0x11 wait 2 - playsnd 472 + playsnd 472 # Misc\Land.WAV playfram 0x10 wait 2 playfram 0x0F @@ -7960,7 +7960,7 @@ FulcrumLanding: FulcrumLiftOff: nobrkcodestart - playsnd 471 + playsnd 471 # Misc\LiftOff.WAV playfram 0x08 wait 2 playfram 0x09 @@ -24546,7 +24546,7 @@ WarpIn SimulacrumWarpIn SimulacrumInit: imgul 1072 0 0 # Simulacrum Shadow (protoss\pdrShad.grp) SimulacrumWalkingToIdle: - playfram 0x00 + playfram 0x33 goto ScourgeLocal00 SimulacrumDeath: @@ -24558,18 +24558,18 @@ SimulacrumDeath: end SimulacrumGndAttkInit: - playfram 0x00 + playfram 0x33 wait 1 nobrkcodestart playsndbtwn 1427 1434 # Simulacrum weapon fire 01, 02, 03, 04, 05, 06, 07, 08 attackwith 1 - playfram 0x33 + playfram 0x00 wait 1 playfram 0x11 wait 1 - playfram 0x33 + playfram 0x22 wait 1 - playfram 0x00 + playfram 0x33 wait 1 nobrkcodeend gotorepeatattk @@ -24607,12 +24607,6 @@ SimulacrumWalking: move 5 wait 1 playfram 0xdd - move 4 - wait 1 - playfram 0xee - move 5 - wait 1 - playfram 0xff goto SimulacrumWalking SimulacrumWarpIn: @@ -42147,7 +42141,6 @@ MatrixInit: goto MatrixBuilt MatrixBuilt: - wait 2 playfram 1 wait 2 playfram 2 @@ -42156,7 +42149,10 @@ MatrixBuilt: wait 2 playfram 4 wait 2 + playfram 5 + wait 2 playfram 0x00 + wait 1 goto MatrixBuilt MatrixDeath: @@ -42168,12 +42164,23 @@ MatrixDeath: end MatrixGndAttkInit: - playfram 0x00 + playfram 6 MatrixGndAttkRpt: wait 1 attack playsndbtwn 1157 1159 # Matrix weaponfire 01, 02, 03 - imgol 1163 0 -25 # Matrix impact + imgol 1163 0 -52 # Matrix impact + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 gotorepeatattk ignorerest goto MatrixBuilt @@ -42589,101 +42596,6 @@ HippogriffWalking: imgol 1551 0 0 # Hippogriff Engines (cm\terran\hippogriff-engines.grp) goto HippogriffLocal00 -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 353 Facade (cm\terran\facade.grp) -.headerstart -IsId 684 -Type 20 -Init FacadeInit -Death FulcrumDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking ScourgeLocal00 -WalkingToIdle ScourgeLocal00 -SpecialState1 StarpadBuilt -SpecialState2 [NONE] -AlmostBuilt FacadeAlmostBuilt -Built StarpadBuilt -Landing FacadeLanding -LiftOff FacadeLiftOff -IsWorking FacadeIsWorking -WorkingToIdle StarpadBuilt -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -FacadeInit: - imgul 1133 0 0 # Facade Shadow (cm\terran\facade-shadow.grp) - goto StarpadBuilt - -FacadeAlmostBuilt: - playfram 20 - goto ScourgeLocal00 - -FacadeLanding: - nobrkcodestart - wait 20 - playsnd 472 # Misc\Land.WAV - playfram 0 - wait 20 -# wait 5 -# playfram 0 -# wait 5 -# playfram 0 -# wait 5 -# playfram 0 -# wait 5 - playfram 0x00 - sigorder 16 - nobrkcodeend - goto ScourgeLocal00 - -FacadeLiftOff: - nobrkcodestart - playsnd 471 # Misc\LiftOff.WAV - playfram 0 - wait 15 -# wait 5 -# playfram 0 -# wait 5 -# playfram 0 -# wait 5 -# playfram 0 - sigorder 16 - nobrkcodeend - goto ScourgeLocal00 - -FacadeIsWorking: - playfram 1 - wait 1 - playfram 3 - wait 1 - playfram 5 - wait 1 - playfram 7 - wait 1 - playfram 9 - wait 1 - playfram 11 - wait 1 - playfram 13 - wait 1 - playfram 15 - wait 1 - playfram 17 - wait 1 - playfram 19 - wait 1 - goto FacadeIsWorking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1085 Wyvern (cm\terran\wyvern.grp) @@ -52574,5 +52486,64 @@ CestusLiftOff: sigorder 16 nobrkcodeend goto ScourgeLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 353 Facade (cm\terran\facade.grp) +.headerstart +IsId 822 +Type 20 +Init FacadeInit +Death FulcrumDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 +SpecialState1 StarpadBuilt +SpecialState2 [NONE] +AlmostBuilt FacadeAlmostBuilt +Built StarpadBuilt +Landing FacadeLanding +LiftOff FacadeLiftOff +IsWorking [NONE] +WorkingToIdle StarpadBuilt +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +FacadeInit: + imgul 1133 0 0 # Facade Shadow (cm\terran\facade-shadow.grp) + goto StarpadBuilt + +FacadeAlmostBuilt: + playfram 20 + goto ScourgeLocal00 + +FacadeLanding: + nobrkcodestart + wait 20 + playsnd 472 # Misc\Land.WAV + playfram 0 + wait 20 + playfram 0x00 + sigorder 16 + nobrkcodeend + goto ScourgeLocal00 + +FacadeLiftOff: + nobrkcodestart + playsnd 471 # Misc\LiftOff.WAV + playfram 0 + wait 16 + sigorder 16 + nobrkcodeend + goto ScourgeLocal00 -## Next free IsId: 822 \ No newline at end of file +## Next free IsId: 823 \ No newline at end of file diff --git a/mpq/unit/cm/protoss/matrix-attack.lol b/mpq/unit/cm/protoss/matrix-attack.lol index a6f0b013..30e09d92 100644 Binary files a/mpq/unit/cm/protoss/matrix-attack.lol and b/mpq/unit/cm/protoss/matrix-attack.lol differ diff --git a/mpq/unit/cm/protoss/matrix-shadow.grp b/mpq/unit/cm/protoss/matrix-shadow.grp index 77bfdd7e..ec9c17cf 100644 Binary files a/mpq/unit/cm/protoss/matrix-shadow.grp and b/mpq/unit/cm/protoss/matrix-shadow.grp differ diff --git a/mpq/unit/cm/protoss/matrix.grp b/mpq/unit/cm/protoss/matrix.grp index a24a7529..4ac23898 100644 Binary files a/mpq/unit/cm/protoss/matrix.grp and b/mpq/unit/cm/protoss/matrix.grp differ diff --git a/mpq/unit/cm/protoss/simulacrum-bright.grp b/mpq/unit/cm/protoss/simulacrum-bright.grp deleted file mode 100644 index 3e737d55..00000000 Binary files a/mpq/unit/cm/protoss/simulacrum-bright.grp and /dev/null differ diff --git a/mpq/unit/cm/protoss/simulacrum-shadow.grp b/mpq/unit/cm/protoss/simulacrum-shadow.grp index 36dbbbdb..9e3387b2 100644 Binary files a/mpq/unit/cm/protoss/simulacrum-shadow.grp and b/mpq/unit/cm/protoss/simulacrum-shadow.grp differ diff --git a/mpq/unit/cm/protoss/simulacrum.grp b/mpq/unit/cm/protoss/simulacrum.grp index e5276ac4..21422b86 100644 Binary files a/mpq/unit/cm/protoss/simulacrum.grp and b/mpq/unit/cm/protoss/simulacrum.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index ed69febb..7ede496e 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 a15647a5..057c52b8 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 b5efb1c3..9941177a 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -13,6 +13,7 @@ Our goals for the next patch (22 March 2025) include: ## Bugfixes - **Gameplay:** + - Projectiles for the **Hotshot**, **Siren**, **Cataphract**, and **Valkyrie** now no longer fail to strike targets that are at max range - **Steward**s are no longer affected by speed modifiers, fixing bugs with attacking targets (r. ArbuzBudesh) - Fixed bad buttonset for Futurist Federation **Stockade**s (r. Londier) - **Audiovisuals:** @@ -23,6 +24,7 @@ Our goals for the next patch (22 March 2025) include: ## Audiovisuals - New model for: + - **Simulacrum**, **Matrix** (c. DeltaCadimus) - **Star Sovereign** (c. Solstice) - New unit responses for: - **Ramesses** (c. Myrian) @@ -35,15 +37,26 @@ Our goals for the next patch (22 March 2025) include: - Movement speed 5 » 5.5 - [Wraith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wraith): - Build time 28 » 25 +- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): + - Now trained at Starpad, from Starport - [Trojan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/trojan): - Build time 30 » 28 +- [Pythean](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/pythean): + - Now trained at Starport, from Nanite Assembly + - Now accelerates faster, reducing drift - [Azazel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/azazel): - **Sublime Shepherd:** - Effect range 4 » 6 - Now always applies to structures - Now applies if the attacker dies before the attack lands +- [Anchor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anchor): + - Transport weight 10 » 15 +- [Sentinel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sentinel): + - Transport weight 8 » 12 - **NEW:** [Cestus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cestus): - Warding outpost; detects and provides armor; no tech requirement +- **NEW:** [Facade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/facade): + - Cloaking outpost; can activate a cloaking field; requires Atlas ## Protoss - [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold): @@ -55,6 +68,9 @@ Our goals for the next patch (22 March 2025) include: - Armor 1 » 0 - [Golem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/golem): - Build time 30 » 28 +- [Vibrance](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/vibrance): + - **Sensory Overload:** + - No longer attacks air units - [Xenolith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/xenolith): - Resource costs 250/150 » 250/200 - Build time 30 » 40 @@ -62,6 +78,8 @@ Our goals for the next patch (22 March 2025) include: - Resource costs 150/25 » 175/25 - **NEW:** [Bulwark](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/bulwark): - Protective core; detects and heals shields; no tech requirement +- [Xenolith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/xenolith): + - Now requires any tier 3, from any tier 2 ## Zerg - [Rilirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rilirokor): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fb6e1fc1..70ccd7c5 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ