diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx index 3641252..87986d9 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Impetus.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Impetus.scx new file mode 100644 index 0000000..df6d043 Binary files /dev/null and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Impetus.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx index b296418..a24ee7c 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx index e9a5652..9511755 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx index 262cade..3bc6fcc 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx index b86f92e..f814859 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx differ 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 75bc2da..7072350 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/CMBW-maps/melee/1v1/Competitive Class 2/(2)Ex Situ.scx b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Ex Situ.scx new file mode 100644 index 0000000..29bd8b9 Binary files /dev/null and b/CMBW-maps/melee/1v1/Competitive Class 2/(2)Ex Situ.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx new file mode 100644 index 0000000..723722f Binary files /dev/null and b/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Fata Morgana.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Fata Morgana.scx index 7b4b1b0..725e7f0 100644 Binary files a/CMBW-maps/melee/1v1/Work in Progress/(2)Fata Morgana.scx and b/CMBW-maps/melee/1v1/Work in Progress/(2)Fata Morgana.scx differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index eff477d..c42f552 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 e71ce02..a3cb9b6 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 65c7504..b263a0c 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 cf68c99..6f026b9 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/arr/units.datex b/mpq/arr/units.datex index a8aa87e..fcbedd3 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 5b116b9..d2d3156 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/font/font_statres.fnt b/mpq/font/font_statres.fnt new file mode 100644 index 0000000..4fa7a91 Binary files /dev/null and b/mpq/font/font_statres.fnt differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 6b6d78b..63ae1fd 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 9868a9d..a828fe3 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/statres.bin b/mpq/rez/statres.bin index c8403e4..02b572f 100644 Binary files a/mpq/rez/statres.bin and b/mpq/rez/statres.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 758273e..dbe59d3 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 # ----------------------------------------------------------------------------- # @@ -28583,7 +28583,7 @@ CyclopsGndAttkRpt: wait 1 nobrkcodestart playfram 0x220 - playsndbtwn 2085 2087 # Cyclops weapon fire 01, 02, 03 + playsndbtwn 2548 2549 # Cyclops weapon fire 01, 02, 03 attack wait 1 playfram 0x240 @@ -31240,7 +31240,12 @@ ArchitectLocal00: ArchitectWalking: setvertpos 0 imgol 1221 0 0 # Architect Engines (cm\protoss\architect-engine.grp) - goto ArchitectLocal00 + goto ArchitectWalking2 + +ArchitectWalking2: + move 4 + wait 1 + goto ArchitectWalking2 ArchitectWarpIn: imgol 143 0 0 # Architect Warp Flash (protoss\empyrean.grp) @@ -38347,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 @@ -50461,7 +50466,7 @@ MatadorCinderModeTurretInit: IsId 740 Type 12 Init WyvernTurretInit -Death WyvernDeath +Death ScourgeExplosionDeath GndAttkInit WyvernTurretGndAttkInit AirAttkInit WyvernTurretGndAttkInit Unused1 [NONE] diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5 index 0e0d496..07f8f2c 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 a311d73..c484efa 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 b8739f3..2ca0095 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 bea2c91..32fdc45 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 0000000..68104a6 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 0000000..a31fff2 Binary files /dev/null and b/mpq/unit/cm/zerg/ocsal-overlay.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index b98244e..efd0fbe 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 41d1e43..48e4a89 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index ebd7b84..9e4c4d5 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ