diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 628d47af..66d12804 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 03e02f75..e362934c 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -737,7 +737,7 @@ Ifrit (Siege Mode) Ifrit Turret (Siege Mode) Tirade (Deployed) Magian -Extended Flingy #531 +Scepter Laser Extended Flingy #532 Extended Flingy #533 Extended Flingy #534 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3d6a1b09..7a6de347 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 bbbc525e..d58d3edf 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 c5edd733..40b539d2 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2528,9 +2528,9 @@ Tirade Engines Tirade Deployed Magian Magian Shadow -Extended Image #1528 -Extended Image #1529 -Extended Image #1530 +Scepter Engines +Scepter Laser +Scepter Laser Impact Extended Image #1531 Extended Image #1532 Extended Image #1533 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index cc3109ae..1aa39beb 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 80892de8..9a6ecdbe 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1218,7 +1218,7 @@ Ifrit (Siege Mode) Ifrit Turret (Siege Mode) Tirade (Deployed) Magian -Extended Sprite #704 +Scepter Laser Extended Sprite #705 Extended Sprite #706 Extended Sprite #707 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 49eaaafb..9833959a 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index c5f587d8..6813e544 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/f/manifold_starbound/fid00.smk b/mpq/portrait/f/manifold_starbound/fid00.smk index cd7a0d05..6512c0ec 100644 Binary files a/mpq/portrait/f/manifold_starbound/fid00.smk and b/mpq/portrait/f/manifold_starbound/fid00.smk differ diff --git a/mpq/portrait/f/manifold_starbound/fid01.smk b/mpq/portrait/f/manifold_starbound/fid01.smk index cd7a0d05..ac6b0eec 100644 Binary files a/mpq/portrait/f/manifold_starbound/fid01.smk and b/mpq/portrait/f/manifold_starbound/fid01.smk differ diff --git a/mpq/portrait/f/manifold_starbound/fid02.smk b/mpq/portrait/f/manifold_starbound/fid02.smk index cd7a0d05..8052ffd9 100644 Binary files a/mpq/portrait/f/manifold_starbound/fid02.smk and b/mpq/portrait/f/manifold_starbound/fid02.smk differ diff --git a/mpq/portrait/f/manifold_starbound/fid03.smk b/mpq/portrait/f/manifold_starbound/fid03.smk index cd7a0d05..9b6fdade 100644 Binary files a/mpq/portrait/f/manifold_starbound/fid03.smk and b/mpq/portrait/f/manifold_starbound/fid03.smk differ diff --git a/mpq/portrait/f/manifold_starbound/tlk00.smk b/mpq/portrait/f/manifold_starbound/tlk00.smk index cd7a0d05..4fa61e6e 100644 Binary files a/mpq/portrait/f/manifold_starbound/tlk00.smk and b/mpq/portrait/f/manifold_starbound/tlk00.smk differ diff --git a/mpq/portrait/f/manifold_starbound/tlk01.smk b/mpq/portrait/f/manifold_starbound/tlk01.smk index cd7a0d05..8f31d61c 100644 Binary files a/mpq/portrait/f/manifold_starbound/tlk01.smk and b/mpq/portrait/f/manifold_starbound/tlk01.smk differ diff --git a/mpq/portrait/f/manifold_starbound/tlk02.smk b/mpq/portrait/f/manifold_starbound/tlk02.smk index cd7a0d05..c5940567 100644 Binary files a/mpq/portrait/f/manifold_starbound/tlk02.smk and b/mpq/portrait/f/manifold_starbound/tlk02.smk differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index a58b6c94..a9327281 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index b8828078..92b174a5 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1730,15 +1730,28 @@ ScepterDeath: ScepterGndAttkInit: setvertpos 0 playfram 0x00 - attackwith 1 + wait 1 + nobrkcodestart + playfram 0x20 playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 - wait 1 + attackwith 1 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x40 + nobrkcodeend + wait 1 + playfram 0x20 + wait 1 + playfram 0x00 gotorepeatattk goto ScepterGndAttkToIdle ScepterWalking: setvertpos 0 -# imgol 225 0 5 # Scepter Engines (thingy\tdrGlow.grp) + imgol 2530 0 0 # Scepter Engines (cm\a\scepter-engine.grp) goto SkryrokorLocal00 ScepterSpecialState1: @@ -6858,4 +6871,77 @@ MagianWalking: move 4 wait 1 playfram 0x60 - goto MagianWalking \ No newline at end of file + goto MagianWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2531 Scepter Laser (cm\a\scepter-laser.grp) +.headerstart +IsId 78 +Type 2 +Init ScepterLaserInit +Death ScepterLaserDeath +GndAttkInit ScepterLaserGndAttkInit +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ScepterLaserInit: + playfram 0x00 + wait 1 + sigorder 1 + goto ScepterLaserGndAttkInit + +ScepterLaserGndAttkInit: + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x00 + wait 1 + goto ScepterLaserGndAttkInit + +ScepterLaserDeath: + imgol 2532 0 0 # Scepter Laser Impact (cm\a\scepter-laser-impact.grp) + domissiledmg + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2532 Phobos Laser Impact (cm\a\scepter-laser-impact.grp) +.headerstart +IsId 79 +Type 1 +Init ScepterLaserImpactInit +Death ScepterLaserImpactDeath +.headerend +# ----------------------------------------------------------------------------- # + +ScepterLaserImpactInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 +ScepterLaserImpactDeath: + wait 1 + end \ No newline at end of file diff --git a/mpq/unit/cm/a/arch-damage.lof b/mpq/unit/cm/a/arch-damage.lof index 7cdf6ea9..39ea64b1 100644 Binary files a/mpq/unit/cm/a/arch-damage.lof and b/mpq/unit/cm/a/arch-damage.lof differ diff --git a/mpq/unit/cm/a/arch-gas.los b/mpq/unit/cm/a/arch-gas.los index bcaa0a3b..cba7d87a 100644 Binary files a/mpq/unit/cm/a/arch-gas.los and b/mpq/unit/cm/a/arch-gas.los differ diff --git a/mpq/unit/cm/a/arch-shadow.grp b/mpq/unit/cm/a/arch-shadow.grp index 2831959b..6a9e41c6 100644 Binary files a/mpq/unit/cm/a/arch-shadow.grp and b/mpq/unit/cm/a/arch-shadow.grp differ diff --git a/mpq/unit/cm/a/arch.grp b/mpq/unit/cm/a/arch.grp index 8083ddd6..ac8f6a5c 100644 Binary files a/mpq/unit/cm/a/arch.grp and b/mpq/unit/cm/a/arch.grp differ diff --git a/mpq/unit/cm/a/scepter-attack.lol b/mpq/unit/cm/a/scepter-attack.lol new file mode 100644 index 00000000..a95dad69 Binary files /dev/null and b/mpq/unit/cm/a/scepter-attack.lol differ diff --git a/mpq/unit/cm/a/scepter-engine.grp b/mpq/unit/cm/a/scepter-engine.grp new file mode 100644 index 00000000..aeb27a98 Binary files /dev/null and b/mpq/unit/cm/a/scepter-engine.grp differ diff --git a/mpq/unit/cm/a/scepter-laser-impact.grp b/mpq/unit/cm/a/scepter-laser-impact.grp new file mode 100644 index 00000000..e429cfe3 Binary files /dev/null and b/mpq/unit/cm/a/scepter-laser-impact.grp differ diff --git a/mpq/unit/cm/a/scepter-laser.grp b/mpq/unit/cm/a/scepter-laser.grp new file mode 100644 index 00000000..df1eeb41 Binary files /dev/null and b/mpq/unit/cm/a/scepter-laser.grp differ diff --git a/mpq/unit/cm/a/scepter.grp b/mpq/unit/cm/a/scepter.grp index 00717c98..8ac54ff2 100644 Binary files a/mpq/unit/cm/a/scepter.grp and b/mpq/unit/cm/a/scepter.grp differ diff --git a/mpq/unit/cm/a/tirade-engine.grp b/mpq/unit/cm/a/tirade-engine.grp index cc231f8a..fa133b44 100644 Binary files a/mpq/unit/cm/a/tirade-engine.grp and b/mpq/unit/cm/a/tirade-engine.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 9cb885d0..86280d86 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 0e227b3a..d226a7cb 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 3682249b..79a84607 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 ef691857..dd62b6f7 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 994ad342..37269d43 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,30 +1,24 @@ -# 17 October 2026 -## Year 4, month 9, patch 3 +# 24 October 2026 +## Year 4, month 10, patch 4 ## Patch goals -- Deploy WIDESCREEN support! +- Complete various fixes to our widescreen implementation! - Continue technical improvements, bugfixes, and audiovisual additions ahead of each of the Gauntlet Stages! - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! - Join our communities ([Discord](https://discord.com/invite/s5SKBmY) | [Fluxer](https://fluxer.gg/1rebBmBw)), or get in touch with Pr0nogo via email! pr0nogo@fraudsclub.com -# Core - -## Widescreen support has arrived! -- A huge shout-out to Jesse, Handfish, Veeq7, and Batty for their contributions to this feature we once thought impossible! -- **IMPORTANT SETUP STEPS:** - - If you use the legacy wmode feature (i.e. you cannot make the game fullscreen by pressing alt+enter), access your Cosmonarchy config via Fraud Launcher 2 and set `prefer-wmode` to `false`. This wmode feature is no longer supported by Cosmonarchy and has been removed from the options menu as a result. - - You will also want to make sure your `Cosmonarchy\Starcraft` directory has cnc-ddraw. You can find the default settings here: https://drive.google.com/file/d/16DVWwEDdJ_z42lpxS0R1Wd3qIjYM4baT/view?usp=sharing -- **Caveats:** - - A few of the following issues are known and will be addressed soon! - - Performance suffers in some cases! You can fix this yourself by going into your `plugins` folder and renaming `aize_debug` to `_aize_debug` in order to stop it from loading, but you won't be able to use the console or speed up the game/replay without it. This is next on our list, and it shouldn't take long! - - Console commands that alter the display or account for mouse cursor are unwieldy currently. We will address this after performance is improved! - - F10 menu has a weird habit of glitching when the screen has a lot of cagra (creep) on it. This is an odd one, we'll look into it last. - - These issues need your help in creating reproduction cases! - - In rare cases, initial fog of war has stripes on it. This resolves itself after moving the camera, but we still want to fix it! - - If you spot an error not on this list, please let us know on discord or fluxer! - - ## Bugfixes -- **Audiovisual:** - - Fixed wrong portrait for Zethalor (r. jun3hong) - - Corrected a unit acknowledgment sound for Tosgrilisk (r. jun3hong) \ No newline at end of file +- **Stability:** + - Resolved crashes on long tooltip hovers (c. Jesse) +- **Audiovisuals:** + - Improve tooltip formatting (c. Jesse) + - Restored Starbound Manifold portrait (r. jun3hong) + - Fixed clipping for Tirade engine (r. fasswawds) + +## Audiovisuals +- New graphics for: + - Scepter, Arch (c. fasswawds; wireframes c. jun3hong) +- New projectile vfx for: + - Scepter, Scralia +- New unit responses for: + - Malkothrokor (c. jun3hong) \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 3668928b..5a11c5a7 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ