diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index ae73b9ec..5d98f399 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -6952,7 +6952,7 @@ Phalanx_Tank_BaseStarEditInit: .headerstart IsId 91 Type 13 -Init ScourgeLocal00 +Init InfestedTerranWalkingToIdle Death ScourgeExplosionDeath GndAttkInit Phalanx_Tank_TurretGndAttkInit AirAttkInit [NONE] @@ -6972,10 +6972,14 @@ SpecialState1 ScourgeLocal00 Phalanx_Tank_TurretGndAttkInit: wait 1 nobrkcodestart + playfram 0x11 playsnd 68 # Bullet\TTaFir00.wav imgol 536 0 0 # Phalanx (Tank) Turret Attack Overlay (thingy\ettFlash.grp) wait 2 attackwith 1 + playfram 0x22 + wait 2 + playfram 0x00 nobrkcodeend gotorepeatattk goto ScourgeLocal00 @@ -7018,8 +7022,8 @@ Phalanx_Siege_BaseInit: imgul 255 0 0 # Phalanx (Siege) Base Shadow (terran\tstShad.grp) wait 1 setflspeed 0 - playsnd 319 # Terran\TANK\TTaTra01.WAV - wait 2 + playsnd 319 + wait 1 playfram 0x11 wait 2 playfram 0x22 @@ -7037,13 +7041,22 @@ Phalanx_Siege_BaseInit: playfram 0x88 wait 2 playfram 0x99 - wait 45 + wait 2 + playfram 0xAA + wait 2 + playfram 0xBB + wait 42 sigorder 1 goto ScourgeLocal00 Phalanx_Siege_BaseSpecialState2: - wait 45 + wait 38 playsnd 319 # Terran\TANK\TTaTra01.WAV + wait 3 + playfram 0xAA + wait 2 + playfram 0x99 + wait 2 playfram 0x88 wait 2 playfram 0x77 @@ -7095,36 +7108,32 @@ AlmostBuilt [NONE] # ----------------------------------------------------------------------------- # Phalanx_Siege_TurretInit: - playfram 0x11 + playfram 0x44 wait 1 nobrkcodestart - wait 14 - playfram 0x22 - wait 2 - playfram 0x33 - wait 2 - playfram 0x44 - wait 20 - playsnd 318 # Terran\TANK\TTaTra00.WAV - wait 6 + wait 17 playfram 0x55 - wait 1 + wait 2 playfram 0x66 - wait 1 + wait 2 playfram 0x77 + wait 17 + playsnd 318 # Terran\TANK\TTaTra00.WAV wait 1 playfram 0x88 - wait 1 + wait 2 playfram 0x99 - wait 1 + wait 2 playfram 0xAA - wait 1 + wait 2 playfram 0xBB - wait 1 + wait 2 playfram 0xCC - wait 1 + wait 2 playfram 0xDD - wait 1 + wait 2 + playfram 0xEE + wait 2 playfram 0x00 nobrkcodeend goto ScourgeLocal00 @@ -7132,11 +7141,16 @@ Phalanx_Siege_TurretInit: Phalanx_Siege_TurretGndAttkInit: wait 1 nobrkcodestart - playsnd 96 # Bullet\TTaFi200.wav - imgoluselo 537 2 0 # Phalanx (Siege) Turret Attack Overlay (thingy\esiFire.grp) + playsnd 96 # Bullet\TTaFi200.wav + imgoluselo 537 2 0 # Siege Tank(Siege) Turret Attack Overlay (thingy\esiFire.grp) wait 2 + playfram 0x11 attackwith 1 - wait 1 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 playfram 0x00 nobrkcodeend gotorepeatattk @@ -7145,32 +7159,27 @@ Phalanx_Siege_TurretGndAttkInit: Phalanx_Siege_TurretSpecialState2: playsnd 318 # Terran\TANK\TTaTra00.WAV - wait 6 + playfram 0xEE + wait 2 playfram 0xDD - wait 1 + wait 2 playfram 0xCC - wait 1 + wait 2 playfram 0xBB - wait 1 + wait 2 playfram 0xAA - wait 1 + wait 2 playfram 0x99 - wait 1 + wait 2 playfram 0x88 - wait 1 + wait 2 playfram 0x77 - wait 1 + wait 27 playfram 0x66 - wait 1 + wait 2 playfram 0x55 - wait 1 + wait 2 playfram 0x44 - wait 30 - playfram 0x33 - wait 2 - playfram 0x22 - wait 2 - playfram 0x11 goto ScourgeLocal00 # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/terran/stank.grp b/mpq/unit/terran/stank.grp index 40b275a4..c48c22fb 100644 Binary files a/mpq/unit/terran/stank.grp and b/mpq/unit/terran/stank.grp differ diff --git a/mpq/unit/terran/stankt.grp b/mpq/unit/terran/stankt.grp index 4eb5be72..1959e29e 100644 Binary files a/mpq/unit/terran/stankt.grp and b/mpq/unit/terran/stankt.grp differ diff --git a/mpq/unit/terran/tank.grp b/mpq/unit/terran/tank.grp index d358578d..da768796 100644 Binary files a/mpq/unit/terran/tank.grp and b/mpq/unit/terran/tank.grp differ diff --git a/mpq/unit/terran/tank.lol b/mpq/unit/terran/tank.lol index 9187f8df..49a8c75b 100644 Binary files a/mpq/unit/terran/tank.lol and b/mpq/unit/terran/tank.lol differ diff --git a/mpq/unit/terran/tankt.grp b/mpq/unit/terran/tankt.grp index 489809f3..44551b32 100644 Binary files a/mpq/unit/terran/tankt.grp and b/mpq/unit/terran/tankt.grp differ diff --git a/mpq/unit/terran/tstshad.grp b/mpq/unit/terran/tstshad.grp index c5137639..624f7ce0 100644 Binary files a/mpq/unit/terran/tstshad.grp and b/mpq/unit/terran/tstshad.grp differ diff --git a/mpq/unit/terran/ttashad.grp b/mpq/unit/terran/ttashad.grp index 74166518..ef0f05de 100644 Binary files a/mpq/unit/terran/ttashad.grp and b/mpq/unit/terran/ttashad.grp differ