diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a5ccc4ef..4bdd17ae 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 c854a2cd..a97d5248 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index 839fa63e..4ff85dc5 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -127,7 +127,7 @@ Jackson Cannon (Wyvern) Skyfall (Paladin ability) Enthralling Assault (Akistrokor ability) Final Hour (Augur behavior) -Ion Cannon +Hammerfall Beacon (Ion Cannon) None Icarus Missiles (Luminary) Litany Cannons (Epigraph) @@ -196,7 +196,7 @@ Antimatter Missile (Positron) Sparring Saber (Sycophant) Kissing Emoji (Smoochie Boy) Khaydarin Plasma Laser (Engram) -Extended Weapon #69 +Ion Cannon (Ion Cannon) Extended Weapon #70 Extended Weapon #71 Extended Weapon #72 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 3e8c7189..fefcc962 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 3c0120c1..f810211a 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index ca42fb3e..4b26a016 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -34439,8 +34439,8 @@ IonCannonBaseGndAttkInit: playfram 0x40 IonCannonBaseGndAttkRpt: nobrkcodestart - sigorder 32 playsnd 1319 # ioncannon-charge-01 + sigorder 32 wait 71 attackwith 1 wait 8 @@ -34853,7 +34853,7 @@ Death SublimeShepherdOverlayDeath # ----------------------------------------------------------------------------- # SublimeShepherdOverlayInit: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 1 SublimeShepherdOverlayLocal00: playfram 1 @@ -34919,7 +34919,7 @@ Death KhaydarinEclipseProtossAccelerantDeath # ----------------------------------------------------------------------------- # KhaydarinEclipseProtossAccelerantInit: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 1 KhaydarinEclipseProtossAccelerantLocal00: playfram 1 @@ -34974,20 +34974,20 @@ KhaydarinEclipseProtossAccelerantDeath: .headerstart IsId 539 Type 26 -Init LobotomyMineInit -Death LobotomyMineDeath +Init [NONE] +Death [NONE] GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 LobotomyMineUnused1 +Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking LobotomyMineWalking -WalkingToIdle LobotomyMineWalkingToIdle -SpecialState1 LobotomyMineSpecialState1 +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] @@ -34999,116 +34999,11 @@ WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] Disable [NONE] -Burrow LobotomyMineBurrow -UnBurrow LobotomyMineUnBurrow +Burrow [NONE] +UnBurrow [NONE] Enable [NONE] .headerend # ----------------------------------------------------------------------------- # - -LobotomyMineInit: - imgul 1372 0 0 # Lobotomy Mine Shadow (cm\terran\lobotomymine-shad.grp) -LobotomyMineWalkingToIdle: - playfram 0x00 # Frame set 0 - goto LobotomyMineLocal00 - -LobotomyMineLocal00: - wait 125 - goto LobotomyMineLocal00 - -LobotomyMineDeath: - playsnd 10 # Misc\Explo1.wav - playfram 12 - wait 1 - playfram 13 - wait 1 - playfram 14 - wait 1 - playfram 15 - wait 1 - playfram 16 - wait 1 - playfram 0x11 - wait 1 - playfram 18 - wait 1 - playfram 19 - wait 1 - playfram 20 - wait 1 - playfram 21 - wait 1 - end - -LobotomyMineWalking: - playsnd 1308 # Lobotomy Mine movement - move 16 - wait 1 - playfram 0x00 - move 16 - wait 1 - playfram 1 - move 16 - wait 1 - playfram 2 - move 16 - wait 1 - playfram 3 - move 16 - wait 1 - playfram 4 - move 16 - wait 1 - playfram 5 - move 16 - wait 1 - playfram 6 - move 16 - wait 1 - playfram 7 - goto LobotomyMineWalking - -LobotomyMineSpecialState1: - castspell - sigorder 1 - imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) - goto LobotomyMineLocal00 - -LobotomyMineUnused1: - fireweapon 89 - sigorder 1 - imgol 1277 0 0 # Lobotomy Mine Death (thingy\tmnExplo.grp) - goto LobotomyMineLocal00 - -LobotomyMineBurrow: - nobrkcodestart - imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playsnd 354 # Terran\VULTURE\TVuMin01.WAV - playfram 8 - wait 1 - playfram 9 - wait 1 - playfram 10 - wait 1 - playfram 11 - wait 1 - sigorder 4 - nobrkcodeend - goto LobotomyMineLocal00 - -LobotomyMineUnBurrow: - nobrkcodestart - imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playsnd 354 # Terran\VULTURE\TVuMin01.WAV - playfram 10 - wait 1 - playfram 9 - wait 1 - playfram 8 - wait 1 - playfram 0x00 - sigorder 4 - nobrkcodeend - goto LobotomyMineWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -35122,31 +35017,31 @@ Death LobotomyMineExplosionDeath # ----------------------------------------------------------------------------- # LobotomyMineExplosionInit: - wait 125 + wait 125 goto LobotomyMineExplosionInit LobotomyMineExplosionDeath: playsnd 1309 - 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 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - 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 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 end # ----------------------------------------------------------------------------- # diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index dacf8786..d7d74a9c 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ