diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx index e7ffa482..70723509 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index e71ce024..a3cb9b67 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 65c7504c..b263a0c3 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 cf68c99a..6f026b9f 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1477,7 +1477,7 @@ Izirokor Birth Izirokor Spore Cuirass Stonewall Protocol Overlay Cyclops Passive Hit -Creep Morph Overlay +Decaying Overlay Salvage Periodic Zap Salvage Disable Small Salvage Disable Medium @@ -1776,8 +1776,8 @@ Dracadin Death Explosion Lanifect Remains Hotshot Hotshot Shadow -Extended Image #776 -Extended Image #777 +Ocsal Regression Overlay +Tyranny Overlay Extended Image #778 Extended Image #779 Extended Image #780 diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 62e1b09c..dbe59d3e 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -2780,16 +2780,16 @@ Death [NONE] # ----------------------------------------------------------------------------- # EggSpawnInit: - playfram 0x00 # Frame set 0 - wait 100 - playfram 1 # Frame set 0, direction 1 - wait 100 - playfram 2 # Frame set 0, direction 2 - wait 100 - playfram 3 # Frame set 0, direction 3 - wait 100 - playfram 4 # Frame set 0, direction 4 - wait 100 + playfram 0x00 + wait 100 + playfram 1 + wait 100 + playfram 2 + wait 100 + playfram 3 + wait 100 + playfram 4 + wait 100 end # ----------------------------------------------------------------------------- # @@ -38352,38 +38352,38 @@ SpecialState1 VorvrokorBirthSpecialState1 # ----------------------------------------------------------------------------- # VorvrokorBirthInit: - playfram 0x00 # Frame set 0 + playfram 0x00 goto VorvrokorBirthLocal00 VorvrokorBirthLocal00: - wait 125 + wait 125 goto VorvrokorBirthLocal00 VorvrokorBirthDeath: - wait 1 + wait 1 end VorvrokorBirthSpecialState1: - wait 1 + wait 1 nobrkcodestart playfram 0x00 - wait 2 + wait 2 playfram 1 - wait 2 + wait 2 playfram 2 - wait 2 + wait 2 playfram 3 - wait 2 + wait 2 playfram 4 - wait 2 + wait 2 playfram 5 - wait 2 + wait 2 playfram 6 - wait 2 + wait 2 playfram 7 - wait 2 - sigorder 4 - lowsprul 319 0 0 # Egg Spawn (zerg\zegspawn.grp) + wait 2 + sigorder 4 + lowsprul 319 0 0 # Egg Spawn (zerg\zegspawn.grp) nobrkcodeend goto VorvrokorBirthLocal00 diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5 index 0e0d496a..07f8f2c5 100644 Binary files a/mpq/tileset/badlands.cv5 and b/mpq/tileset/badlands.cv5 differ diff --git a/mpq/tileset/badlands.vf4 b/mpq/tileset/badlands.vf4 index a311d73a..c484efa1 100644 Binary files a/mpq/tileset/badlands.vf4 and b/mpq/tileset/badlands.vf4 differ diff --git a/mpq/tileset/badlands.vr4 b/mpq/tileset/badlands.vr4 index b8739f3c..2ca00952 100644 Binary files a/mpq/tileset/badlands.vr4 and b/mpq/tileset/badlands.vr4 differ diff --git a/mpq/tileset/badlands.vx4ex b/mpq/tileset/badlands.vx4ex index bea2c913..32fdc45d 100644 Binary files a/mpq/tileset/badlands.vx4ex and b/mpq/tileset/badlands.vx4ex differ diff --git a/mpq/unit/cm/protoss/tyranny-overlay.grp b/mpq/unit/cm/protoss/tyranny-overlay.grp new file mode 100644 index 00000000..68104a64 Binary files /dev/null and b/mpq/unit/cm/protoss/tyranny-overlay.grp differ diff --git a/mpq/unit/cm/zerg/creep-morph-overlay.grp b/mpq/unit/cm/terran/decaying-overlay.grp similarity index 100% rename from mpq/unit/cm/zerg/creep-morph-overlay.grp rename to mpq/unit/cm/terran/decaying-overlay.grp diff --git a/mpq/unit/cm/zerg/ocsal-overlay.grp b/mpq/unit/cm/zerg/ocsal-overlay.grp new file mode 100644 index 00000000..a31fff23 Binary files /dev/null and b/mpq/unit/cm/zerg/ocsal-overlay.grp differ diff --git a/patchnotes.md b/patchnotes.md index bc1facf3..e743c5f2 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -71,6 +71,9 @@ Patch goals include: - Scribe (materials and attack animation) - Aurora (extended attack animation) - Quazilisk, Nathrokor (new dual-birth animations) +- Added placeholder reads for: + - Zerg Ocsal origin + - Protoss Tyranny of the Sun - Added unique remnants for: - Lanifect (c. Baelethal) - Added weapon SFX for: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8ccdfe91..6656374b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ