diff --git a/CMBW-maps/melee/1v1/(2)Crossguard.scx b/CMBW-maps/melee/1v1/(2)Crossguard.scx index 99ce0451..acc69cac 100644 Binary files a/CMBW-maps/melee/1v1/(2)Crossguard.scx and b/CMBW-maps/melee/1v1/(2)Crossguard.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Equilibrium.scx b/CMBW-maps/melee/1v1/(2)Equilibrium.scx index ee6dd01a..4a9599ef 100644 Binary files a/CMBW-maps/melee/1v1/(2)Equilibrium.scx and b/CMBW-maps/melee/1v1/(2)Equilibrium.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Megalith Empire.scx b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx index 133c6694..bbefd260 100644 Binary files a/CMBW-maps/melee/1v1/(2)Megalith Empire.scx and b/CMBW-maps/melee/1v1/(2)Megalith Empire.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Proxima.scx b/CMBW-maps/melee/1v1/(2)Proxima.scx index 16e2a6f7..83456ace 100644 Binary files a/CMBW-maps/melee/1v1/(2)Proxima.scx and b/CMBW-maps/melee/1v1/(2)Proxima.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx index e750b773..28ecde6a 100644 Binary files a/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx and b/CMBW-maps/melee/1v1/(2)Rest in Paradise.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Terminus.scx b/CMBW-maps/melee/1v1/(2)Terminus.scx index afbd6f88..96b6dd34 100644 Binary files a/CMBW-maps/melee/1v1/(2)Terminus.scx and b/CMBW-maps/melee/1v1/(2)Terminus.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx b/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx index e2b8df74..70ea69b0 100644 Binary files a/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx and b/CMBW-maps/melee/1v1/(2)Wild Whirlwind.scx differ diff --git a/CMBW-maps/melee/1v1/(4)Arctic Artifact.scx b/CMBW-maps/melee/1v1/(4)Arctic Artifact.scx index 52365b29..87c1b8a7 100644 Binary files a/CMBW-maps/melee/1v1/(4)Arctic Artifact.scx and b/CMBW-maps/melee/1v1/(4)Arctic Artifact.scx differ diff --git a/CMBW-maps/melee/1v1/(4)Enigma.scx b/CMBW-maps/melee/1v1/(4)Enigma.scx deleted file mode 100644 index 463b44fd..00000000 Binary files a/CMBW-maps/melee/1v1/(4)Enigma.scx and /dev/null differ diff --git a/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx b/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx index 0e656469..2d2a4ec2 100644 Binary files a/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx and b/CMBW-maps/melee/1v1/(4)Jungles of Jericho.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Boskevine.scx b/CMBW-maps/melee/1v1/Tournament Pool/(2)Boskevine.scx similarity index 91% rename from CMBW-maps/melee/1v1/(2)Boskevine.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(2)Boskevine.scx index 24f49446..458a1fb8 100644 Binary files a/CMBW-maps/melee/1v1/(2)Boskevine.scx and b/CMBW-maps/melee/1v1/Tournament Pool/(2)Boskevine.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/Tournament Pool/(2)Death Spiral.scx similarity index 93% rename from CMBW-maps/melee/1v1/(2)Death Spiral.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(2)Death Spiral.scx index b392d0f1..68677ee4 100644 Binary files a/CMBW-maps/melee/1v1/(2)Death Spiral.scx and b/CMBW-maps/melee/1v1/Tournament Pool/(2)Death Spiral.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/Tournament Pool/(2)Infinite Velocity.scx similarity index 95% rename from CMBW-maps/melee/1v1/(2)Infinite Velocity.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(2)Infinite Velocity.scx index 047d37c1..b92da8d5 100644 Binary files a/CMBW-maps/melee/1v1/(2)Infinite Velocity.scx and b/CMBW-maps/melee/1v1/Tournament Pool/(2)Infinite Velocity.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Maim Street.scx b/CMBW-maps/melee/1v1/Tournament Pool/(2)Maim Street.scx similarity index 100% rename from CMBW-maps/melee/1v1/(2)Maim Street.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(2)Maim Street.scx diff --git a/CMBW-maps/melee/1v1/(2)Nemesis Station.scx b/CMBW-maps/melee/1v1/Tournament Pool/(2)Nemesis Station.scx similarity index 95% rename from CMBW-maps/melee/1v1/(2)Nemesis Station.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(2)Nemesis Station.scx index d912d0ed..46c1264e 100644 Binary files a/CMBW-maps/melee/1v1/(2)Nemesis Station.scx and b/CMBW-maps/melee/1v1/Tournament Pool/(2)Nemesis Station.scx differ diff --git a/CMBW-maps/melee/1v1/(2)Repulsion.scx b/CMBW-maps/melee/1v1/Tournament Pool/(2)Repulsion.scx similarity index 94% rename from CMBW-maps/melee/1v1/(2)Repulsion.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(2)Repulsion.scx index 7f1afccc..4412a871 100644 Binary files a/CMBW-maps/melee/1v1/(2)Repulsion.scx and b/CMBW-maps/melee/1v1/Tournament Pool/(2)Repulsion.scx differ diff --git a/CMBW-maps/melee/1v1/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Tournament Pool/(4)Nitro Valley.scx similarity index 95% rename from CMBW-maps/melee/1v1/(4)Nitro Valley.scx rename to CMBW-maps/melee/1v1/Tournament Pool/(4)Nitro Valley.scx index 5676c59d..f2769d11 100644 Binary files a/CMBW-maps/melee/1v1/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/Tournament Pool/(4)Nitro Valley.scx differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 8522ce07..d2f0d6bc 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 6b04b2b5..3dd1c83f 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index f122b1ad..7b74a2eb 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -4759,79 +4759,79 @@ AlmostBuilt ZergConstruction_Medium_AlmostBuilt ZergConstruction_Medium_Init: imgul 106 0 0 # Zerg Building Construction Shadow (zerg\ZBShad.grp) - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 ZergConstruction_Medium_Local00: - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 9 # Frame set 0, direction 9 - wait 2 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 goto ZergConstruction_Medium_Local00 ZergConstruction_Medium_Death: - playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) - wait 1 + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) + wait 1 end ZergConstruction_Medium_SpecialState1: - playfram 13 # Frame set 0, direction 13 - wait 2 - playfram 14 # Frame set 0, direction 14 - wait 2 - playfram 15 # Frame set 0, direction 15 - wait 2 - playfram 16 # Frame set 0, direction 16 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 18 # Frame set 1, direction 1 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 16 # Frame set 0, direction 16 - wait 2 - playfram 15 # Frame set 0, direction 15 - wait 2 - playfram 14 # Frame set 0, direction 14 - wait 2 + playfram 13 + wait 2 + playfram 14 + wait 2 + playfram 15 + wait 2 + playfram 16 + wait 2 + playfram 0x11 + wait 2 + playfram 18 + wait 2 + playfram 0x11 + wait 2 + playfram 16 + wait 2 + playfram 15 + wait 2 + playfram 14 + wait 2 goto ZergConstruction_Medium_SpecialState1 ZergConstruction_Medium_AlmostBuilt: - sigorder 32 - playfram 19 # Frame set 1, direction 2 - wait 2 - playfram 20 # Frame set 1, direction 3 - wait 2 - playfram 21 # Frame set 1, direction 4 - wait 2 - sigorder 4 + sigorder 32 + playfram 19 + wait 2 + playfram 20 + wait 2 + playfram 21 + wait 2 + sigorder 4 goto ZergConstruction_Medium_Local01 ZergConstruction_Medium_Local01: - wait 125 + wait 125 goto ZergConstruction_Medium_Local01 # ----------------------------------------------------------------------------- # @@ -27367,7 +27367,7 @@ Enable [NONE] # ----------------------------------------------------------------------------- # ApostleInit: - imgul 1118 0 0 # Apostle Shadow (cm\terran\apostle-shad.grp) + imgul 1118 0 4 # Apostle Shadow (cm\terran\apostle-shad.grp) ApostleWalkingToIdle: playfram 0x00 ApostleLocal00: @@ -46020,7 +46020,7 @@ WarpIn VagrantWarpIn # ----------------------------------------------------------------------------- # VagrantInit: - imgul 1277 0 0 # Vagrant Shadow (cm\protoss\vagrant-shad.grp) + imgul 1277 0 -2 # Vagrant Shadow (cm\protoss\vagrant-shad.grp) playfram 0x00 wait 2 goto VagrantLocal69 diff --git a/mpq/unit/cm/terran/apostle-shadow.grp b/mpq/unit/cm/terran/apostle-shadow.grp index 5717f203..e0a9f342 100644 Binary files a/mpq/unit/cm/terran/apostle-shadow.grp and b/mpq/unit/cm/terran/apostle-shadow.grp differ diff --git a/mpq/unit/cm/terran/blackjack-shadow.grp b/mpq/unit/cm/terran/blackjack-shadow.grp index cf76bfe7..ffea8cae 100644 Binary files a/mpq/unit/cm/terran/blackjack-shadow.grp and b/mpq/unit/cm/terran/blackjack-shadow.grp differ diff --git a/mpq/unit/cm/terran/blackjack.grp b/mpq/unit/cm/terran/blackjack.grp index 4c07b66d..f63ee4ff 100644 Binary files a/mpq/unit/cm/terran/blackjack.grp and b/mpq/unit/cm/terran/blackjack.grp differ diff --git a/mpq/unit/cm/terran/cataphract-shadow.grp b/mpq/unit/cm/terran/cataphract-shadow.grp index 6f74d512..3d1035df 100644 Binary files a/mpq/unit/cm/terran/cataphract-shadow.grp and b/mpq/unit/cm/terran/cataphract-shadow.grp differ diff --git a/mpq/unit/cm/terran/cataphract.grp b/mpq/unit/cm/terran/cataphract.grp index acdd2c02..aabd61af 100644 Binary files a/mpq/unit/cm/terran/cataphract.grp and b/mpq/unit/cm/terran/cataphract.grp differ diff --git a/mpq/unit/cm/terran/cyclops-shadow.grp b/mpq/unit/cm/terran/cyclops-shadow.grp index 9e1b6e70..84d37706 100644 Binary files a/mpq/unit/cm/terran/cyclops-shadow.grp and b/mpq/unit/cm/terran/cyclops-shadow.grp differ diff --git a/mpq/unit/cm/terran/cyclops.grp b/mpq/unit/cm/terran/cyclops.grp index c5dfde2a..fd2a84c0 100644 Binary files a/mpq/unit/cm/terran/cyclops.grp and b/mpq/unit/cm/terran/cyclops.grp differ diff --git a/mpq/unit/cm/terran/cyprian-shadow.grp b/mpq/unit/cm/terran/cyprian-shadow.grp index 00a7229c..c4a9d1cc 100644 Binary files a/mpq/unit/cm/terran/cyprian-shadow.grp and b/mpq/unit/cm/terran/cyprian-shadow.grp differ diff --git a/mpq/unit/cm/terran/cyprian.grp b/mpq/unit/cm/terran/cyprian.grp index d6b494d8..89065ea8 100644 Binary files a/mpq/unit/cm/terran/cyprian.grp and b/mpq/unit/cm/terran/cyprian.grp differ diff --git a/mpq/unit/cm/terran/madcap-shad.grp b/mpq/unit/cm/terran/madcap-shad.grp index 5717f203..beaa960c 100644 Binary files a/mpq/unit/cm/terran/madcap-shad.grp and b/mpq/unit/cm/terran/madcap-shad.grp differ diff --git a/mpq/unit/cm/terran/madcap.grp b/mpq/unit/cm/terran/madcap.grp index d96dd475..9e22a536 100644 Binary files a/mpq/unit/cm/terran/madcap.grp and b/mpq/unit/cm/terran/madcap.grp differ diff --git a/mpq/unit/cm/terran/madrigal-base.grp b/mpq/unit/cm/terran/madrigal-base.grp index 36c1aaf8..86987278 100644 Binary files a/mpq/unit/cm/terran/madrigal-base.grp and b/mpq/unit/cm/terran/madrigal-base.grp differ diff --git a/mpq/unit/cm/terran/madrigal-turret.grp b/mpq/unit/cm/terran/madrigal-turret.grp index 9f914d18..737fc825 100644 Binary files a/mpq/unit/cm/terran/madrigal-turret.grp and b/mpq/unit/cm/terran/madrigal-turret.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index bab3f8ac..e04f9463 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 de293aa8..d102a51c 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 0763039b..4d38e23a 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -6,5 +6,16 @@ TBD. ## Latest content -TBD. +- [Pr0totype 15 - Warp Field Stabilized](https://youtu.be/6I8qGYDUo-A) +- Castovers: + - [Btyb88 vs Alekxhandr](https://youtu.be/DIxu_oTdqbQ) by Pr0nogo +## Gameplay +- Apollyoid Adhesive now divides the number of attacks hit by 2 in order to get the final stacks, to avoid most instances of the effect stacking multiple times from a single attack (r. fagguto) + - Caveat: this means you need to hit with at least two parts of a single attack in order to get one stack! + +## Audiovisuals +- Improved sprites for: + - Cyprian (lighting and proportions, c. Solstice) + - Cyclops, Blackjack, Madrigal (lighting, c. Solstice) + - Madcap, Cataphract (lighting and animations, c. Solstice) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 335a02a8..e2bbf1bb 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ