diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 13e03166..a7f7547a 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 270bd676..f35bb359 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -16046,12 +16046,12 @@ Death [NONE] # ----------------------------------------------------------------------------- # YamatoGunTrailInit: - playfram 0x11 # Frame set 1 - wait 2 - playfram 0x22 # Frame set 2 - wait 2 - playfram 0x33 # Frame set 3 - wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 end # ----------------------------------------------------------------------------- # @@ -16068,19 +16068,19 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # Lockdown_EMPShockwaveMissileInit: - playfram 0x00 # Frame set 0 - wait 1 - sigorder 1 - wait 1 + playfram 0x00 + wait 1 + sigorder 1 + wait 1 Lockdown_EMPShockwaveMissileGndAttkInit: - sprol 309 0 0 # Longbolt/Gemini Missiles Trail (thingy\smoke.grp) + sprol 309 0 0 # Longbolt/Gemini Missiles Trail (thingy\smoke.grp) wait 3 goto Lockdown_EMPShockwaveMissileGndAttkInit Lockdown_EMPShockwaveMissileDeath: - imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) + imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) domissiledmg - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -16111,20 +16111,20 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # PhalanxSiegeTurretOverlayInit: - playfram 0x00 # Frame set 0 - wait 1 - playfram 0x11 # Frame set 1 - wait 1 - playfram 0x22 # Frame set 2 - wait 1 - playfram 0x33 # Frame set 3 - wait 1 - playfram 0x44 # Frame set 4 - wait 1 - playfram 0x55 # Frame set 5 - wait 1 - playfram 0x66 # Frame set 6 - wait 1 + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 end # ----------------------------------------------------------------------------- # @@ -16141,40 +16141,40 @@ Death ScienceVesselOverlayDeath # ----------------------------------------------------------------------------- # ScienceVesselOverlayInit: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 1 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 1 ScienceVesselOverlayDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -16190,24 +16190,24 @@ Death HallucinationHitDeath # ----------------------------------------------------------------------------- # HallucinationHitInit: - playfram 0x00 # Frame set 0 - wait 2 - 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 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 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 + playfram 7 + wait 2 HallucinationHitDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -16220,42 +16220,42 @@ Death [NONE] # ----------------------------------------------------------------------------- # Unknown254Init: - playfram 0x00 # Frame set 0 - wait 2 - 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 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 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 - playfram 12 # Frame set 0, direction 12 - wait 2 - 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 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 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 + playfram 12 + wait 2 + playfram 13 + wait 2 + playfram 14 + wait 2 + playfram 15 + wait 2 + playfram 16 + wait 2 + playfram 0x11 + wait 2 end # ----------------------------------------------------------------------------- # @@ -16270,24 +16270,24 @@ Death [NONE] # ----------------------------------------------------------------------------- # Unknown255Init: - playfram 0x00 # Frame set 0 - wait 2 - 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 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 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 + playfram 7 + wait 2 + playfram 8 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18319,12 +18319,12 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # CantavisGlowInit: - playfram 0x00 # Frame set 0 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 0x22 # Frame set 2 - wait 2 + playfram 0x00 + wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18339,20 +18339,20 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # NeedleSpinesOverlayInit: - playfram 0x00 # Frame set 0 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 0x22 # Frame set 2 - wait 2 - playfram 0x33 # Frame set 3 - wait 2 - playfram 0x44 # Frame set 4 - wait 2 - playfram 0x55 # Frame set 5 - wait 2 - playfram 0x66 # Frame set 6 - wait 2 + playfram 0x00 + wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 + playfram 0x44 + wait 2 + playfram 0x55 + wait 2 + playfram 0x66 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18367,37 +18367,37 @@ Death FlamethrowerDeath # ----------------------------------------------------------------------------- # FlamethrowerInit: - playsndbtwn 314 315 # Terran\Firebat\TFBFir00.WAV | Terran\Firebat\TFBFir01.WAV + playsndbtwn 314 315 # Terran\Firebat\TFBFir00.WAV | Terran\Firebat\TFBFir01.WAV goto FlamethrowerLocal00 FlamethrowerLocal00: - playfram 0x11 # Frame set 1 - wait 1 - playfram 0x22 # Frame set 2 - wait 1 - playfram 0x33 # Frame set 3 - wait 1 - playfram 0x44 # Frame set 4 - wait 1 - playfram 0x55 # Frame set 5 - wait 1 - playfram 0x66 # Frame set 6 - wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 goto FlamethrowerLocal01 FlamethrowerLocal01: - playfram 0x99 # Frame set 9 - wait 1 - playfram 0xaa # Frame set 10 - wait 1 - playfram 0xbb # Frame set 11 - wait 1 + playfram 0x99 + wait 1 + playfram 0xaa + wait 1 + playfram 0xbb + wait 1 goto FlamethrowerDeath FlamethrowerDeath: nobrkcodeend gotorepeatattk - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -18412,26 +18412,26 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # GeminiMissilesExplosionInit: - playfram 0x00 # Frame set 0 - wait 2 - 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 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 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 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18447,87 +18447,87 @@ Death YamatoGunOverlayDeath YamatoGunOverlayInit: playsnd 178 # Terran\BATTLE\tBaYam01.wav - playfram 4 # Frame set 0, direction 4 + playfram 4 nobrkcodestart - 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 10 # Frame set 0, direction 10 - wait 2 - 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 10 # Frame set 0, direction 10 - wait 2 - 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 10 # Frame set 0, direction 10 - wait 2 - 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 10 # Frame set 0, direction 10 - wait 2 - 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 10 # Frame set 0, direction 10 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + 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 10 + 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 10 + 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 10 + 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 10 + wait 2 + playfram 0x00 + wait 2 + playfram 1 castspell - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 1 - sigorder 2 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 1 + sigorder 2 nobrkcodeend gotorepeatattk YamatoGunOverlayDeath: @@ -18546,34 +18546,34 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # YamatoGunHitInit: - playfram 0x00 # Frame set 0 - wait 2 - 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 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 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 - playfram 12 # Frame set 0, direction 12 - wait 2 - playfram 13 # Frame set 0, direction 13 - wait 2 + 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 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 + playfram 12 + wait 2 + playfram 13 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18644,42 +18644,42 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # PsionicStormPartVariant1Init: - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18695,43 +18695,43 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # PsionicStormPartVariant2Init: - playfram 0x00 # Frame set 0 - setflipstate 1 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 + playfram 0x00 + setflipstate 1 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + 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 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 end # ----------------------------------------------------------------------------- # @@ -18746,20 +18746,20 @@ Death [NONE] # ----------------------------------------------------------------------------- # EMPShockwaveHit_Part1_Init: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 end # ----------------------------------------------------------------------------- # @@ -18774,22 +18774,22 @@ Death [NONE] # ----------------------------------------------------------------------------- # EMPShockwaveHit_Part2_Init: - playsnd 7 # Misc\ExploLrg.wav - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - imgul 555 0 0 # EMP Shockwave Hit (Part1) (thingy\emp.grp) - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 + playsnd 7 # Misc\ExploLrg.wav + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + imgul 555 0 0 # EMP Shockwave Hit (Part1) (thingy\emp.grp) + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 end # ----------------------------------------------------------------------------- # @@ -18806,32 +18806,32 @@ Death HallucinationDeathDeath # ----------------------------------------------------------------------------- # HallucinationDeathInit: - playfram 0x00 # Frame set 0 - wait 3 - playfram 1 # Frame set 0, direction 1 - wait 3 - playfram 2 # Frame set 0, direction 2 - wait 3 - playfram 3 # Frame set 0, direction 3 - wait 3 - playfram 4 # Frame set 0, direction 4 - wait 3 - playfram 5 # Frame set 0, direction 5 - wait 3 - playfram 6 # Frame set 0, direction 6 - wait 3 - playfram 7 # Frame set 0, direction 7 - wait 3 - playfram 8 # Frame set 0, direction 8 - wait 3 - playfram 9 # Frame set 0, direction 9 - wait 3 - playfram 10 # Frame set 0, direction 10 - wait 3 - playfram 11 # Frame set 0, direction 11 - wait 3 - playfram 12 # Frame set 0, direction 12 - wait 3 + playfram 0x00 + wait 3 + playfram 1 + wait 3 + playfram 2 + wait 3 + playfram 3 + wait 3 + playfram 4 + wait 3 + playfram 5 + wait 3 + playfram 6 + wait 3 + playfram 7 + wait 3 + playfram 8 + wait 3 + playfram 9 + wait 3 + playfram 10 + wait 3 + playfram 11 + wait 3 + playfram 12 + wait 3 end HallucinationDeathDeath: @@ -18863,30 +18863,30 @@ Death Flames_Small_Death # ----------------------------------------------------------------------------- # Flames_Small_Init: - playfram 0x00 # Frame set 0 - wait 2 - 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 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 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 + 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 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 goto Flames_Small_Init Flames_Small_Death: @@ -18904,30 +18904,30 @@ Death Flames_Small_Death Unknown323Init: setflipstate 1 - playfram 0x00 # Frame set 0 - wait 2 - 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 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 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 + 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 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 goto Flames_Small_Init # ----------------------------------------------------------------------------- # @@ -18945,22 +18945,22 @@ Death Bleeding_Small_Variant1Death # ----------------------------------------------------------------------------- # Bleeding_Small_Variant1Init: - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 goto Bleeding_Small_Variant1Init Bleeding_Small_Variant1Death: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -18978,19 +18978,19 @@ Death Bleeding_Small_Variant1Death # ----------------------------------------------------------------------------- # Bleeding_Small_Variant2Init: - setflipstate 1 - playfram 0x00 # Frame set 0 - wait 2 - 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 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 + setflipstate 1 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 goto Bleeding_Small_Variant1Init # ----------------------------------------------------------------------------- # @@ -19018,30 +19018,30 @@ Death Flames_Large_Death # ----------------------------------------------------------------------------- # Flames_Large_Init: - playfram 12 # Frame set 0, direction 12 - wait 2 - 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 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 - playfram 22 # Frame set 1, direction 5 - wait 2 - playfram 23 # Frame set 1, direction 6 - wait 2 + playfram 12 + 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 19 + wait 2 + playfram 20 + wait 2 + playfram 21 + wait 2 + playfram 22 + wait 2 + playfram 23 + wait 2 goto Flames_Large_Init Flames_Large_Death: @@ -19058,31 +19058,31 @@ Death Flames_Large_Death # ----------------------------------------------------------------------------- # Unknown327Init: - setflipstate 1 - playfram 12 # Frame set 0, direction 12 - wait 2 - 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 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 - playfram 22 # Frame set 1, direction 5 - wait 2 - playfram 23 # Frame set 1, direction 6 - wait 2 + setflipstate 1 + playfram 12 + 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 19 + wait 2 + playfram 20 + wait 2 + playfram 21 + wait 2 + playfram 22 + wait 2 + playfram 23 + wait 2 goto Flames_Large_Init # ----------------------------------------------------------------------------- # @@ -19100,18 +19100,18 @@ Death Bleeding_Large_Variant1Death # ----------------------------------------------------------------------------- # Bleeding_Large_Variant1Init: - 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 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 goto Bleeding_Large_Variant1Init Bleeding_Large_Variant1Death: @@ -19133,19 +19133,19 @@ Death Bleeding_Large_Variant1Death # ----------------------------------------------------------------------------- # Bleeding_Large_Variant2Init: - setflipstate 1 - 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 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 + setflipstate 1 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 goto Bleeding_Large_Variant1Init # ----------------------------------------------------------------------------- # @@ -19233,11 +19233,11 @@ Death ConfirmCircleDeath # ----------------------------------------------------------------------------- # ConfirmCircleInit: - playfram 0x00 # Frame set 0 + playfram 0x00 goto InfestedTerranLocal00 ConfirmCircleDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -42727,7 +42727,7 @@ TarasqueSporesDeath: playsnd 79 # Bullet\ZLuHit00.wav sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -51958,7 +51958,7 @@ Engines_MultiGlowHeader_OmniInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 532 Hammerfall Beacon (bullet\grenade.grp) +# 1716 Hammerfall Beacon (cm\terran\ion-cannon-beacon.grp) .headerstart IsId 731 Type 2 @@ -51987,10 +51987,68 @@ HammerfallBeaconLocal00: wait 2 playfram 3 wait 2 - goto FragmentationGrenadeLocal00 + goto HammerfallBeaconLocal00 HammerfallBeaconDeath: imgol 440 0 0 # Fragmentation Grenade Hit (thingy\efgHit.grp) domissiledmg wait 1 + imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) + wait 14 + imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) + wait 14 + imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) + wait 14 + imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) + wait 14 + imgol 556 0 0 # EMP Shockwave Hit (Part2) (thingy\empl.grp) + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1717 Zarcavrokor Bone (cm\zerg\zarcavrokor-bone.grp) +.headerstart +IsId 732 +Type 2 +Init ZarcavrokorBoneInit +Death ZarcavrokorBoneDeath +GndAttkInit ZarcavrokorBoneGndAttkInit +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ZarcavrokorBoneInit: + playfram 0x00 + wait 1 + sigorder 1 + playfram 0x20 + wait 1 +ZarcavrokorBoneGndAttkInit: + playfram 0x40 + wait 1 +ZarcavrokorBoneLocal00: + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 1 + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + goto ZarcavrokorBoneLocal00 + +ZarcavrokorBoneDeath: + playsnd 79 # Bullet\ZLuHit00.wav + sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) + domissiledmg + wait 1 end \ No newline at end of file diff --git a/patchnotes.md b/patchnotes.md index b85d3c09..54edb431 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -46,6 +46,7 @@ Continuing March Madness into April, tweaking the economic pacing some more, and - Nemean Reactors removed - [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle): - Gas cost now 150, from 125 + - Last Breath removed - [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury): - Time cost now 50, from 45 - [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon):