diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 0fd2e8f2..e6c3920a 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 73c27967..0af9d3b7 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index b6e72a1f..8b5c3293 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/orders.txt b/mpq/arr/orders.txt index ec97ab86..64832c0e 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -26,7 +26,7 @@ Nothing 3 (Unused) Drone Start Mutate Drone Mutate Use Ability (Infest 1) -Use Ability (Infest 2) unused +Use Ability (Preylock) Infest (Queen) Build (SCV) Build (Probe) @@ -137,7 +137,7 @@ Attack Ground (Infested Terran) Hold Position (Suicide Units) Use Ability (Dimensional Recall) Teleport To Location (Freezes the casting unit) -Use Ability (Scanner Sweep) unused +Use Ability (Remote Hijack) Idle (Scanner Sweep) Use Ability (Defensive Matrix) Use Ability (Psionic Storm) diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a6db21e2..2926c84b 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 3997d1a0..d7100a25 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 9e61908b..d394ce0b 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -46,8 +46,8 @@ None Hive Tissue (Malkothrokor) Lobotomy Warhead (Triton) Prying Eyes (Facade) -Extended Tech #5 -Extended Tech #6 +Remote Hijack (Askosi) +Preylock (Askosi) Lobotomy Grenade (Goska dupe) Skryspawn (Stroluum) Extended Tech #9 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a8db5022..e19c448b 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 5e01895d..fdfdd16b 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 a0e4a668..37126f2e 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 2f8a59af..6a8be731 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 6f318620..25d1d0d8 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -380,7 +380,7 @@ x<3><4>Parasitic Excision <1>(<3>X<1>)<10>After a 1-second channel, the Matralet g<3><4>Plague <1>(<3>G<1>)<10>After a 1-second channel, creates a 3-range zone that lasts 10 seconds. Victims that enter the zone are infected with Plague, and take up to 50 damage over 5 seconds.<10>On death, victims create a smaller 1.5-range infection zone that lasts 5 seconds. Plague cannot kill its victims.<0> ¤<3><4>Ensnaring Brood <2>(passive)<10>Allies within 4 range of a Matraleth apply Ensnare with every attack. Ensnared targets move and attack 33% slower. Ensnare expires after 2 seconds.<0> a<1><4>Assemble Vassal <1>(<3>A<1>)<10>Light fighter.<0> -<0> +c<3><4>Remote Hijack <1>(<3>C<1>)<10>Launches a bioform that attaches to the victim and slows their movement speed by 50%.<10>After 5 seconds, the bioform becomes the target.<10>The bioform is released from their new form on death, or immediately if the target is an embedded craft.<0> ¤<3><4>Ormis Materializer <2>(passive)<10>Emissaries can load allies from up to 4 range.<0> ¤<3><4>Robotic Fleet <2>(passive)<10>Solarions can assemble up to 12 Stewards to use in their attacks. Solarions cannot attack without any Stewards.<0> v<1><4>Warp in Prostration Stage <1>(<3>V<1>)<10>Relentless disciple production.<0> @@ -964,11 +964,11 @@ b<1><4>Install Zylode <1>(<3>B<1>)<10>Advanced mechanized production.<0> Zylode Requires<10> Cipher AND Gauntlet<0> b<1><4>Install Astrolabe <1>(<3>B<1>)<10>Advanced skyborne production.<0> Astrolabe Requires<10> Proscenium OR Zylode<0> -<0> -<0> -<0> -<0> -<0> +Must target enemy units.<0> +Must target allied units.<0> +Must target allied ground units.<0> +Must target enemy units or allied embedded units.<0> +Must target units with no hijackers.<0> <0> <0> <0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 5293d0a1..67d52d48 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 c29243aa..b73934a2 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -4530,6 +4530,75 @@ LightningImpactSmallDeath: playfram 9 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2296 Paraclete (cm\askosi\paraclete.grp) +.headerstart +IsId 54 +Type 21 +Init ParacleteInit +Death ParacleteDeath +GndAttkInit ParacleteGndAttkInit +AirAttkInit ParacleteGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ParacleteGndAttkInit +AirAttkRpt ParacleteGndAttkInit +CastSpell [NONE] +GndAttkToIdle ParacleteGndAttkToIdle +AirAttkToIdle ParacleteGndAttkToIdle +Unused2 [NONE] +Walking ParacleteWalking +WalkingToIdle ParacleteLocal00 +SpecialState1 ParacleteSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +ParacleteInit: + imgulnextid 0 42 # Paraclete Shadow (cm\askosi\paraclete.grp) +ParacleteGndAttkToIdle: + playfram 0x00 +ParacleteLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ParacleteLocal00 + +ParacleteDeath: + playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +ParacleteGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + attackwith 1 + wait 2 + attackwith 1 + wait 1 + nobrkcodeend + gotorepeatattk + goto ParacleteGndAttkToIdle + +ParacleteWalking: + setvertpos 0 +# imgol 225 0 5 # Paraclete Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +ParacleteSpecialState1: + playfram 0x00 + wait 12 + goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index fc508328..51725710 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 dcb9af4b..ba62b8c1 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 331534c3..32e3d9f4 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 cfb0f07b..4582e859 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 d7d52b64..07da11f5 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -12,8 +12,19 @@ # Core changes ## Bugfixes +- **Desyncs:** + - Removed floating point math for: (c. Jesse, some a. Veeq7) + - Weapon & sight ranges + - Structure HP gain (e.g. **Askosi** teambuild cases) + - Lifesteal and shieldsteal + - Morningstar damage + - Clarion Phase Link distribution +- **Gameplay:** + - Resolved unit limit error for maps with more than 1700 preplaced units (c. DF) - **Audiovisual** + - Fixed invalid shield overlay for **Rove** - Corrected strings for being out of energy as Askosi (r. Sosij) + - Filled in wireframes for **Avatar** and **Phontis** (placeholder) - Added missing **Multi-Attack III** passive button for **Starbound Manifold** (r. Concealed Organic) ## Audiovisuals diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 81e96c07..8da4b078 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ