diff --git a/CMBW-maps/melee/FFA Solo/(4)Excise.scx b/CMBW-maps/melee/FFA Solo/(4)Excise.scx new file mode 100644 index 00000000..2d5d4ea0 Binary files /dev/null and b/CMBW-maps/melee/FFA Solo/(4)Excise.scx differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 697b5910..f72762d7 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 8e54f790..80c43134 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 1b7e3ca1..b304e31f 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -334,7 +334,7 @@ Terran Civilian Sarah Kerrigan Infested Kerrigan Crashed Minotaur -Terran Psi Disrupter +Terran Psi Disruptor Terran Power Generator Zerg Overmind Zerg Overmind (Shell) diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index cc839f44..365d735a 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 1fa2a013..a720f0ce 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -4133,6 +4133,7 @@ OvermindShellDeath: wait 7 playsnd 774 # Zerg\Bldg\ZBldgDth.WAV imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) wait 3 end @@ -12540,7 +12541,7 @@ CenotaphOverlayIsWorking: IsId 176 Type 20 Init KhaydarinCrystalFormationInit -Death AtelierDeath +Death GatewayDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -23025,7 +23026,7 @@ TwilightDoodadLocal00: IsId 405 Type 20 Init OvermindCocoonInit -Death OvermindCocoonDeath +Death CerebrateDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -23052,19 +23053,7 @@ WarpIn [NONE] OvermindCocoonInit: imgul 924 0 0 # Overmind Cocoon Shadow (zerg\ZovShad.grp) playfram 0x00 - goto OvermindCocoonLocal00 - -OvermindCocoonLocal00: - wait 125 - goto OvermindCocoonLocal00 - -OvermindCocoonDeath: - playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) - wait 1 - end + goto ScourgeLocal00 OvermindCocoonAlmostBuilt: playfram 0x00 @@ -23205,73 +23194,55 @@ PsiDisrupterDeath: wait 1 end -## # ----------------------------------------------------------------------------- # -## # This header is used by images.dat entries: -## # 949 Power Generator (neutral\Generate.grp) -## .headerstart -## IsId 408 -## Type 20 -## Init PowerGeneratorInit -## Death PowerGeneratorDeath -## GndAttkInit [NONE] -## AirAttkInit [NONE] -## Unused1 [NONE] -## GndAttkRpt [NONE] -## AirAttkRpt [NONE] -## CastSpell [NONE] -## GndAttkToIdle [NONE] -## AirAttkToIdle [NONE] -## Unused2 [NONE] -## Walking [NONE] -## WalkingToIdle [NONE] -## SpecialState1 [NONE] -## SpecialState2 [NONE] -## AlmostBuilt [NONE] -## Built PowerGeneratorBuilt -## Landing [NONE] -## LiftOff [NONE] -## IsWorking PowerGeneratorIsWorking -## WorkingToIdle PowerGeneratorIsWorking -## WarpIn [NONE] -## .headerend -## # ----------------------------------------------------------------------------- # -## -## PowerGeneratorInit: -## imgul 950 0 0 # Power Generator Shadow (neutral\tgnShad.grp) -## PowerGeneratorBuilt: -## playfram 0x00 -## wait 2 -## playfram 1 -## wait 2 -## playfram 2 -## wait 2 -## playfram 3 -## wait 2 -## playfram 4 -## wait 2 -## playfram 5 -## wait 2 -## playfram 6 -## wait 2 -## goto PowerGeneratorBuilt -## -## PowerGeneratorDeath: -## playsnd 7 # Misc\ExploLrg.wav -## imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) -## wait 3 -## liftoffcondjmp PowerGeneratorLocal00 -## lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) -## wait 1 -## end -## -## PowerGeneratorLocal00: -## wait 1 -## end -## -## PowerGeneratorIsWorking: -## wait 125 -## goto PowerGeneratorIsWorking - + # ----------------------------------------------------------------------------- # + # This header is used by images.dat entries: + # 949 Power Generator (neutral\Generate.grp) + .headerstart + IsId 408 + Type 20 + Init PowerGeneratorInit + Death AtelierDeath + GndAttkInit [NONE] + AirAttkInit [NONE] + Unused1 [NONE] + GndAttkRpt [NONE] + AirAttkRpt [NONE] + CastSpell [NONE] + GndAttkToIdle [NONE] + AirAttkToIdle [NONE] + Unused2 [NONE] + Walking [NONE] + WalkingToIdle [NONE] + SpecialState1 [NONE] + SpecialState2 [NONE] + AlmostBuilt [NONE] + Built PowerGeneratorBuilt + Landing [NONE] + LiftOff [NONE] + IsWorking ScourgeLocal00 + WorkingToIdle ScourgeLocal00 + WarpIn [NONE] + .headerend + # ----------------------------------------------------------------------------- # + + PowerGeneratorInit: + imgul 950 0 0 # Power Generator Shadow (neutral\tgnShad.grp) + PowerGeneratorBuilt: + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + goto PowerGeneratorBuilt # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/tileset/twilight.cv5 b/mpq/tileset/twilight.cv5 index 0e682c1e..29ad6ecf 100644 Binary files a/mpq/tileset/twilight.cv5 and b/mpq/tileset/twilight.cv5 differ diff --git a/mpq/tileset/twilight.vf4 b/mpq/tileset/twilight.vf4 index b8686453..677dc897 100644 Binary files a/mpq/tileset/twilight.vf4 and b/mpq/tileset/twilight.vf4 differ diff --git a/mpq/tileset/twilight.vr4 b/mpq/tileset/twilight.vr4 index d5aa1639..30e5e170 100644 Binary files a/mpq/tileset/twilight.vr4 and b/mpq/tileset/twilight.vr4 differ diff --git a/mpq/tileset/twilight.vx4ex b/mpq/tileset/twilight.vx4ex index db6ee511..7fc6081c 100644 Binary files a/mpq/tileset/twilight.vx4ex and b/mpq/tileset/twilight.vx4ex differ diff --git a/patchnotes.md b/patchnotes.md index 0d023811..44b0a2b4 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -23,5 +23,8 @@ This patch includes stability and bugfixes, audiovisual improvements, and (event - Seraphs can now be trained from Starports which border the top of the map (r. faktheking) - An out-of-scope feature involving dominated units restoring energy to their master has been removed (c. Veeq7) - Cancelling an Excisant now properly reinstates worker HP from the morph time + - Khaydarin Crystal Formation is no longer invincible by default - Audiovisuals: - - Fixed flipped coordinates in right-click minimap markers \ No newline at end of file + - Fixed flipped coordinates in right-click minimap markers + - Reimplemented animation and shadow for Power Generator + - Corrected death animations for Power Generator, Overmind Cocoon, Overmind (with Shell), and Khaydarin Crystal Formation \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 14d5ccac..d7291830 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ