diff --git a/master changelog.md b/master changelog.md index 4ab7582..d6c671b 100644 --- a/master changelog.md +++ b/master changelog.md @@ -5,6 +5,7 @@ Since December 2022, this changelog shows only past changes. See patchnotes.md for info on the most recent patch! # Table of Contents +- [6 April 2024](#6-april-2024] - [23 March 2024](#23-march-2024) - [16 March 2024](#16-march-2024] - [2 March 2024][#2-march-2024] @@ -83,6 +84,74 @@ See patchnotes.md for info on the most recent patch! - [13 August 2020](#13-august-2020) - [12 August 2020](#12-august-2020) +# 6 April 2024 + +This patch includes bugfixes, audiovisual improvements, and balance adjustments. + +Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zip) for easier setup and maintenance! + +We are still hunting for desyncs! Please submit your critical logs to cm-issues on [our Discord server](https://discord.com/invite/s5SKBmY). + +## General +- **Internals:** + - Upgraded Discord support to include replay / witness status, game mode, and race (c. Veeq7) + - Cases where a unit's sprite is unexpectedly nonexistant will now print debug info to the screen -- **please screenshot this** and [submit it to us on discord!](https://discord.com/invite/s5SKBmY) + - Added "Prudence", a clone of the Artisan that can warp in structures, for use in UMS +- **Config:** + - Renamed 'config.yml' to 'cosmonarchy.yml' and migrated it to the user's Starcraft folder, centralizing configs for both prerelease and release (c. Veeq7) + - Added 'ingame' and 'witness' options for selection and minimap UI (c. Veeq7) + - Autosaved replays are now stored in a unique folder per date played (c. Veeq7) + - Added Furen advisor + +## Bugfixes: +- **Stability:** + - Resolved a common desync case (with help from DF and Veeq7) + - **Caveat:** At least one other desync case still exists; please keep the reports coming! + - Protected against another nullsprite crash (r. Faktheking) +- **Gameplay:** + - Fixed an issue where unit turrets would be stunned even after certain stun effects wore off (r. TheBeaver99) + - Fixed tile walkability for Iceworld -> Higher Outpost +- **Audiovisuals:** + - Fixed repair animations not playing when repairing a unit suffering from HP drains (r. neblime) + - Fixed flipped weapon fire SFX for Savant modes (r. lolrsk8s) + - Fixed Kalkalisk birth animation playing the wrong frame sequence + - Discord activity now updates on first launch (c. Veeq7) + +## Audiovisuals +- Added reads for: + - Vilgoleth (corpse consumption proc) +- Added birth animations for: + - Iroleth (from egg), Tosgrilisk, Ghitorokor, Axitrilisk (WIP), Cherbrathalor, Okrimnilisk, Tetcaerokor +- Updated visuals for: + - Amaranth attack sequence + - Golem, Idol death animations +- Updated SFX for: + - Terran addon construction + - Golem death +- Added new SFX for: + - Ancile, Cataphract, Vassal, Idol, Empyrean death + - Amaranth, Exemplar weaponhit + +## Protoss +- [Ecclesiast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ecclesiast): + - Astral Blessing proc range now 3, from 2 +- [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect): + - No longer attacks air targets +- [Matrix](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/matrix): + - Astral Tether proc range now 3, from 2 + +## Zerg +- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk): + - Armor penetration now 2, from 3 +- [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk): + - Collision size now significantly larger + - Omnispores: + - Weapon damage now 1x4, from 1x8 +- [Surkith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant): + - Armor now 2, from 3 +- [Spraith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/spraith-cesiant): + - Armor now 3, from 2 + # 23 March 2024 This patch includes bugfixes, audiovisual improvements, and mild balance adjustments. diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 54041e9..500f505 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 19414db..b23f297 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 ab5479b..28395cd 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1223,7 +1223,7 @@ Architect Engines Kalkalisk Birth (Cocoon) Iroleth Birth (Cocoon) Nathrokor Birth -Alkajelisk Birth +Alkajelisk Birth (Egg) Shaman (Support Mode) Shaman Shadow Protoss Temple Shadow @@ -1837,9 +1837,9 @@ Tosgrilisk Birth (Egg) Tosgrilisk Birth (Cocoon) Iroleth Birth (Egg) Tetcaerokor Birth (Egg) -Extended Image #837 -Extended Image #838 -Extended Image #839 +Alkajelisk Birth (Cocoon) +Zarcavrokor Birth (Egg) +Zarcavrokor Birth (Cocoon) Extended Image #840 Extended Image #841 Extended Image #842 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 30c2a63..a01283c 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 88b588c..d44aa39 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -71,12 +71,11 @@ ScourgeLocal01: wait 2 goto ScourgeLocal01 -ScourgeLocal00: - wait 125 - goto ScourgeLocal00 InfestedTerranWalkingToIdle: playfram 0x00 +ScourgeLocal00: + wait 125 goto ScourgeLocal00 Generic_Wait1End: @@ -108,7 +107,7 @@ ScourgeDeathInit: IsId 3 Type 1 Init ScourgeExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -133,10 +132,6 @@ ScourgeExplosionInit: wait 1 end -ScourgeExplosionDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 005 Rilirokor (zerg\brood.grp) @@ -227,46 +222,15 @@ RilirokorWalking: # 008 Infested Terran (zerg\bugguy.grp) .headerstart IsId 6 -Type 26 +Type 0 Init InfestedTerranInit Death [NONE] -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 [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # InfestedTerranInit: imgul 9 0 0 # Infested Terran Shadow (zerg\zbgShad.grp) - playfram 0x00 - goto InfestedTerranLocal00 - -InfestedTerranLocal00: - wait 125 - goto InfestedTerranLocal00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -275,7 +239,7 @@ InfestedTerranLocal00: IsId 7 Type 1 Init InfestedTerranExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -371,7 +335,7 @@ ZergCocoonDeath: ZergCocoonSpecialState1: sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergCocoonSpecialState2: playfram 14 @@ -387,7 +351,7 @@ ZergCocoonSpecialState2: playfram 9 wait 2 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergCocoonGndAttkToIdle: wait 1 @@ -422,7 +386,7 @@ ZergCocoonUnused2: playfram 23 wait 2 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergCocoonAlmostBuilt: # Ovileth mutate @@ -453,7 +417,7 @@ ZergCocoonCastSpell: playfram 29 wait 2 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -647,7 +611,7 @@ IsthrathalethWalking: IsthrathalethSpecialState2: playfram 0x110 - goto InfestedTerranLocal00 + goto ScourgeLocal00 IsthrathalethBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -662,7 +626,7 @@ IsthrathalethBurrow: playfram 0x110 wait 1 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 IsthrathalethUnBurrow: wait 1 @@ -693,11 +657,11 @@ Unused1 DrolethUnused1 GndAttkRpt DrolethGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking DrolethWalking -WalkingToIdle DrolethWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] SpecialState2 DrolethSpecialState2 AlmostBuilt DrolethAlmostBuilt @@ -718,12 +682,7 @@ Enable [NONE] DrolethInit: imgul 18 0 7 # Droleth Shadow (zerg\drone.grp) - playfram 0x00 - goto InfestedTerranLocal00 - -DrolethWalkingToIdle: - playfram 0x00 - goto InfestedTerranLocal00 + goto InfestedTerranWalkingToIdle DrolethDeath: playsnd 833 # Zerg\DRONE\ZDrDth00.WAV @@ -771,7 +730,7 @@ DrolethUnused1: wait 2 setfldirect 13 nobrkcodeend - goto DrolethWalkingToIdle + goto InfestedTerranWalkingToIdle DrolethGndAttkInit: setvertpos 0 @@ -780,7 +739,7 @@ DrolethGndAttkInit: wait 1 attackwith 1 gotorepeatattk - goto InfestedTerranLocal00 + goto ScourgeLocal00 DrolethWalking: setvertpos 0 @@ -814,7 +773,7 @@ DrolethLocal00: DrolethSpecialState2: playfram 0x176 - goto InfestedTerranLocal00 + goto ScourgeLocal00 DrolethAlmostBuilt: setvertpos 0 @@ -836,7 +795,7 @@ DrolethAlmostBuilt: DrolethLiftOff: sigorder 16 - goto InfestedTerranLocal00 + goto ScourgeLocal00 DrolethBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -851,7 +810,7 @@ DrolethBurrow: playfram 0x176 wait 1 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 DrolethUnBurrow: wait 1 @@ -867,7 +826,7 @@ DrolethUnBurrow: wait 1 playfram 0x00 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -956,14 +915,14 @@ EggSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 024 Egg Remnants (zerg\zegDeath.grp) .headerstart IsId 14 -Type 0 +Type 1 Init EggRemnantsInit Death EggRemnantsDeath .headerend @@ -1137,7 +1096,7 @@ GeszithalorBirthSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1400,11 +1359,7 @@ HydraliskWalking: HydraliskSpecialState2: playfram 280 - goto HydraliskLocal04 - -HydraliskLocal04: - wait 125 - goto HydraliskLocal04 + goto ScourgeLocal00 HydraliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -1419,7 +1374,7 @@ HydraliskBurrow: playfram 280 wait 1 sigorder 4 - goto HydraliskLocal04 + goto ScourgeLocal00 HydraliskUnBurrow: wait 1 @@ -1443,9 +1398,9 @@ HydraliskUnBurrow: # 1415 Axitrilisk Remnants (cm\shared\axitrilisk-death.grp) .headerstart IsId 19 -Type 0 +Type 1 Init HydraliskRemnantsInit -Death HydraliskRemnantsDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -1463,10 +1418,6 @@ HydraliskRemnantsInit: wait 255 wait 24 end - -HydraliskRemnantsDeath: - wait 1 - end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1607,7 +1558,7 @@ InfestedKerriganCastSpell: playfram 0x00 nobrkcodeend gotorepeatattk - goto InfestedTerranLocal00 + goto ScourgeLocal00 InfestedKerriganWalking: move 4 @@ -1639,7 +1590,7 @@ InfestedKerriganWalking: InfestedKerriganBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InfestedKerriganUnBurrow: wait 1 @@ -1647,7 +1598,7 @@ InfestedKerriganUnBurrow: imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) playfram 0x88 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -1674,7 +1625,7 @@ SpecialState1 [NONE] LarvaInit: playfram 0x00 # Frame set 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 LarvaDeath: playsnd 849 # Zerg\Larva\ZLaDth00.WAV @@ -1705,7 +1656,7 @@ LarvaWalking: # 037 Larva Remnants (zerg\zlaDeath.grp) .headerstart IsId 22 -Type 0 +Type 1 Init LarvaRemnantsInit Death LarvaRemnantsDeath .headerend @@ -2332,11 +2283,7 @@ UltrokorWalking: UltrokorSpecialState2: playfram 0x187 - goto UltrokorLocal04 - -UltrokorLocal04: - wait 125 - goto UltrokorLocal04 + goto ScourgeLocal00 UltrokorBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -2368,7 +2315,7 @@ UltrokorBurrow: imgol 423 -15 21 # Burrowing Dust (thingy\bDust.grp) wait 1 sigorder 4 - goto UltrokorLocal04 + goto ScourgeLocal00 UltrokorUnBurrow: wait 1 @@ -2592,11 +2539,7 @@ ZethrokorWalking: ZethrokorSpecialState2: playfram 0x110 - goto ZethrokorLocal04 - -ZethrokorLocal04: - wait 125 - goto ZethrokorLocal04 + goto ScourgeLocal00 ZethrokorBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -2611,7 +2554,7 @@ ZethrokorBurrow: playfram 0x110 wait 1 sigorder 4 - goto ZethrokorLocal04 + goto ScourgeLocal00 ZethrokorUnBurrow: wait 1 @@ -2636,7 +2579,7 @@ ZethrokorUnBurrow: IsId 33 Type 1 Init ZergAirDeathExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -2666,7 +2609,7 @@ ZergAirDeathExplosionInit: IsId 34 Type 1 Init ZergBuildingExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -2746,7 +2689,7 @@ SpecialState1 ZergBirthSpecialState1 ZergBirthInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergBirthUnused: wait 1 @@ -2768,7 +2711,7 @@ ZergBirthUnused: sigorder 4 lowsprul 319 0 0 # Egg Spawn (zerg\zegspawn.grp) nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergBirthSpecialState1: wait 1 @@ -2790,7 +2733,7 @@ ZergBirthSpecialState1: sigorder 4 lowsprul 319 0 0 # Egg Spawn (zerg\zegspawn.grp) nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -2850,7 +2793,7 @@ WarpIn [NONE] CerebrateInit: imgul 62 0 0 # Cerebrate Shadow (zerg\zucShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CerebrateDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV @@ -2895,7 +2838,7 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedMinistryWalking +Walking ScourgeLocal00 WalkingToIdle InfestedMinistryBuilt SpecialState1 InfestedMinistrySpecialState1 SpecialState2 [NONE] @@ -2914,7 +2857,7 @@ InfestedMinistryInit: imgol 101 0 0 # Infested Ministry Overlay (zerg\Infest03.grp) InfestedMinistryBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InfestedMinistryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -2932,11 +2875,7 @@ LiftedTerranStructureDeath: InfestedMinistrySpecialState1: playfram 4 - goto InfestedTerranLocal00 - -InfestedMinistryWalking: - wait 125 - goto InfestedMinistryWalking + goto ScourgeLocal00 InfestedMinistryLanding: nobrkcodestart @@ -2967,7 +2906,7 @@ InfestedMinistryLiftOff: playfram 4 sigorder 16 nobrkcodeend - goto InfestedMinistryWalking + goto ScourgeLocal00 InfestedMinistryIsWorking: playfram 6 @@ -3168,8 +3107,8 @@ AlmostBuilt CagrantCesiantAlmostBuilt Built CagrantCesiantBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -3177,7 +3116,7 @@ WarpIn [NONE] CagrantCesiantInit: imgul 69 0 0 # Cagrant Cesiant Shadow (zerg\zfcShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CagrantCesiantAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) @@ -3532,7 +3471,7 @@ WarpIn [NONE] SurkithCesiantInit: playfram 0x00 imgul 77 0 0 # Surkith Cesiant Shadow (zerg\zluShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 SurkithCesiantGndAttkInit: trgtarccondjmp 74 42 SurkithCesiantLocal00 @@ -3743,7 +3682,7 @@ WarpIn [NONE] MatureChrysalisInit: playfram 0x00 imgul 79 0 0 # Mature Chrysalis Shadow (neutral\nkoShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 MatureChrysalisAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) @@ -4062,7 +4001,7 @@ WarpIn [NONE] NydusCesiantInit: playfram 0x00 imgul 87 0 0 # Nydus Cesiant Shadow (zerg\znyShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 NydusCesiantAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) @@ -4118,11 +4057,7 @@ WarpIn [NONE] OvermindShellInit: imgul 1257 0 0 # Overmind (with shell) Shadow (cm\zerg\overmind-shell-shadow.grp) playfram 0x00 - goto OvermindShellLocal00 - -OvermindShellLocal00: - wait 125 - goto OvermindShellLocal00 + goto ScourgeLocal00 OvermindShellDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV @@ -4217,11 +4152,7 @@ WarpIn [NONE] OvermindNoShellInit: imgul 1234 0 0 # Overmind (without shell) Shadow (cm\zerg\overmind-shadow.grp) playfram 0x00 - goto OvermindNoShellLocal00 - -OvermindNoShellLocal00: - wait 125 - goto OvermindNoShellLocal00 + goto ScourgeLocal00 OvermindNoShellDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV @@ -4364,7 +4295,7 @@ WarpIn [NONE] ExcisantInit: imgul 94 0 0 # Excisant Shadow (zerg\zreShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ExcisantDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV @@ -4614,7 +4545,7 @@ WarpIn [NONE] SpraithCesiantInit: imgul 100 0 0 # Spraith Cesiant Shadow (zerg\zscShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 SpraithCesiantAirAttkInit: playfram 4 @@ -4661,7 +4592,7 @@ SpraithCesiantBuilt: IsId 60 Type 1 Init InfestedOverlayInit -Death InfestedOverlayDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -4674,10 +4605,6 @@ InfestedOverlayInit: wait 2 goto InfestedOverlayInit -InfestedOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 105 Zerg Construction (Small) (zerg\ZBuild.grp) @@ -4742,7 +4669,7 @@ ZergConstruction_Small_AlmostBuilt: playfram 12 wait 2 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -4840,11 +4767,7 @@ ZergConstruction_Medium_AlmostBuilt: playfram 21 wait 2 sigorder 4 - goto ZergConstruction_Medium_Local01 - -ZergConstruction_Medium_Local01: - wait 125 - goto ZergConstruction_Medium_Local01 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -4952,7 +4875,7 @@ ZergBuildingMorphAlmostBuilt: playfram 30 wait 2 sigorder 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -5003,7 +4926,7 @@ ZergConstruction_Large_Death: IsId 65 Type 1 Init ZergBuildingSpawnInit -Death ZergBuildingSpawnDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -5016,10 +4939,6 @@ ZergBuildingSpawnInit: wait 2 end -ZergBuildingSpawnDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 218 Minotaur (terran\BattleCr.grp) @@ -5034,8 +4953,8 @@ Unused1 [NONE] GndAttkRpt MinotaurGndAttkInit AirAttkRpt MinotaurAirAttkInit CastSpell MinotaurCastSpell -GndAttkToIdle MinotaurGndAttkToIdle -AirAttkToIdle MinotaurGndAttkToIdle +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle ScourgeLocal00 Unused2 [NONE] Walking MinotaurWalking WalkingToIdle MinotaurWalkingToIdle @@ -5046,11 +4965,7 @@ SpecialState1 [NONE] MinotaurInit: imgul 219 0 42 # Minotaur Shadow (terran\BattleCr.grp) playfram 0x00 - goto MinotaurGndAttkToIdle - -MinotaurGndAttkToIdle: - wait 125 - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MinotaurDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav @@ -5069,7 +4984,7 @@ MinotaurLocal00: attackwith 1 playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 gotorepeatattk - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MinotaurAirAttkInit: imgol 446 0 0 # Minotaur Attack Overlay (thingy\elbBat.grp) @@ -5080,15 +4995,15 @@ MinotaurLocal01: attackwith 2 playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 gotorepeatattk - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MinotaurCastSpell: imgolorig 543 # Yamato Gun Overlay (thingy\eycBlast.grp) - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MinotaurWalking: imgol 220 0 0 # Minotaur Engines (thingy\tbaGlow.grp) - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MinotaurWalkingToIdle: setvertpos 0 @@ -5209,7 +5124,7 @@ TrojanDeath: TrojanWalking: setvertpos 0 imgol 225 0 5 # Trojan Engines (thingy\tdrGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -5633,11 +5548,7 @@ EidolonSpecialState1: wait 1 playfram 0x22 wait 1 - goto EidolonLocal05 - -EidolonLocal05: - wait 125 - goto EidolonLocal05 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -5646,7 +5557,7 @@ EidolonLocal05: IsId 72 Type 1 Init EidolonDeathInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -5713,7 +5624,7 @@ NukeBeamDeath: IsId 74 Type 1 Init NukeTargetDotInit -Death NukeTargetDotDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -5726,16 +5637,12 @@ NukeTargetDotInit: wait 2 goto NukeTargetDotInit -NukeTargetDotDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 234 Goliath Base (terran\goliath.grp) .headerstart IsId 75 -Type 23 +Type 12 Init Goliath_Base_Init Death Goliath_Base_Death GndAttkInit [NONE] @@ -5750,16 +5657,6 @@ Unused2 [NONE] Walking Goliath_Base_Walking WalkingToIdle Goliath_Base_WalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -5767,11 +5664,7 @@ Goliath_Base_Init: imgul 236 0 0 # Goliath Shadow (terran\tgoShad.grp) Goliath_Base_WalkingToIdle: playfram 0x00 - goto Goliath_Base_Local00 - -Goliath_Base_Local00: - wait 125 - goto Goliath_Base_Local00 + goto ScourgeLocal00 Goliath_Base_Death: playsnd 2820 # Goliath death 01 @@ -5836,7 +5729,7 @@ Goliath_Base_Walking: IsId 76 Type 12 Init Goliath_Turret_Init -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit Goliath_Turret_GndAttkInit AirAttkInit Goliath_Turret_AirAttkInit Unused1 [NONE] @@ -5854,7 +5747,7 @@ SpecialState1 [NONE] Goliath_Turret_Init: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Goliath_Turret_GndAttkInit: playfram 0xdd @@ -6101,11 +5994,7 @@ SarahKerriganSpecialState1: wait 1 playfram 0x22 wait 1 - goto SarahKerriganLocal05 - -SarahKerriganLocal05: - wait 125 - goto SarahKerriganLocal05 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6319,7 +6208,7 @@ MaverickWalking: # 1474 Izirokor Remnants (cm\zerg\izirokor-corpse.grp) .headerstart IsId 79 -Type 0 +Type 1 Init GenericRemnantsThreeInit Death GenericRemnantsThreeDeath .headerend @@ -6344,7 +6233,7 @@ GenericRemnantsThreeDeath: IsId 80 Type 1 Init MaverickDeathInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -6377,7 +6266,7 @@ MaverickDeathInit: IsId 81 Type 1 Init ScannerSweepInit -Death ScannerSweepDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -6403,15 +6292,7 @@ ScannerSweepInit: wait 63 wait 63 sigorder 4 - goto ScannerSweepLocal00 - -ScannerSweepLocal00: - wait 125 - goto ScannerSweepLocal00 - -ScannerSweepDeath: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6470,16 +6351,12 @@ WraithGndAttkInit: playfram 0x00 gotorepeatattk nobrkcodeend - goto WraithLocal00 - -WraithLocal00: - wait 125 - goto WraithLocal00 + goto ScourgeLocal00 WraithWalking: setvertpos 0 imgol 245 0 0 # Wraith Engines (terran\wraith-engine.grp) - goto WraithLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6488,18 +6365,18 @@ WraithWalking: IsId 83 Type 12 Init WraithAfterburnersInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking WraithAfterburnersInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -6529,7 +6406,7 @@ GndAttkToIdle MasonGndAttkToIdle AirAttkToIdle [NONE] Unused2 [NONE] Walking MasonWalking -WalkingToIdle MasonWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt MasonAlmostBuilt @@ -6538,12 +6415,7 @@ AlmostBuilt MasonAlmostBuilt MasonInit: imgul 248 0 7 # Mason Shadow (terran\scv.grp) - playfram 0x00 - goto InfestedTerranLocal00 - -MasonWalkingToIdle: - playfram 0x00 - goto InfestedTerranLocal00 + goto InfestedTerranWalkingToIdle MasonDeath: playsnd 369 # Terran\SCV\TSCDth00.WAV @@ -6564,7 +6436,7 @@ MasonUnused1: setfldirect 12 tmprmgraphicend nobrkcodeend - goto MasonWalkingToIdle + goto InfestedTerranWalkingToIdle MasonGndAttkInit: setvertpos 0 @@ -6575,11 +6447,11 @@ MasonGndAttkInit: playfram 0x11 wait 1 gotorepeatattk - goto InfestedTerranLocal00 + goto ScourgeLocal00 MasonGndAttkToIdle: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 MasonWalking: playfram 0x00 @@ -6673,11 +6545,7 @@ VultureWalking: playfram 0x00 setvertpos 0 imgol 1555 0 0 # Vulture Engines - goto VultureLocal00 - -VultureLocal00: - wait 125 - goto VultureLocal00 + goto ScourgeLocal00 VultureSpecialState1: attackwith 1 @@ -6726,11 +6594,7 @@ SpiderMineInit: imgul 259 0 0 # Spider Mine Shadow (terran\tsmShad.grp) SpiderMineWalkingToIdle: playfram 0x00 - goto SpiderMineLocal00 - -SpiderMineLocal00: - wait 125 - goto SpiderMineLocal00 + goto ScourgeLocal00 SpiderMineDeath: playsnd 10 # Misc\Explo1.wav @@ -6787,14 +6651,14 @@ SpiderMineSpecialState1: sigorder 1 playsnd 10 # Misc\Explo1.wav imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) - goto SpiderMineLocal00 + goto ScourgeLocal00 SpiderMineUnused2: fireweapon 89 sigorder 1 playsnd 10 # Misc\Explo1.wav imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) - goto SpiderMineLocal00 + goto ScourgeLocal00 SpiderMineBurrow: nobrkcodestart @@ -6810,7 +6674,7 @@ SpiderMineBurrow: wait 1 sigorder 4 nobrkcodeend - goto SpiderMineLocal00 + goto ScourgeLocal00 SpiderMineUnBurrow: nobrkcodestart @@ -6832,7 +6696,7 @@ SpiderMineUnBurrow: # 260 Seraph (Base) (terran\wessel.grp) .headerstart IsId 88 -Type 12 +Type 13 Init SeraphBaseInit Death SeraphBaseDeath GndAttkInit [NONE] @@ -6844,8 +6708,8 @@ CastSpell SeraphBaseCastSpell GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 SeraphBaseSpecialState1 .headerend # ----------------------------------------------------------------------------- # @@ -6854,9 +6718,7 @@ SeraphBaseInit: imgol 261 0 0 # Seraph (Turret) (terran\wesselt.grp) imgul 262 0 42 # Seraph Shadow (terran\tveShad.grp) playfram 0x00 -SeraphLocal00: - wait 125 - goto SeraphLocal00 + goto ScourgeLocal00 SeraphBaseDeath: playsnd 348 # Terran\VESSEL\TVeDth00.WAV @@ -6874,7 +6736,7 @@ SeraphBaseCastSpell: nobrkcodeend gotorepeatattk sigorder 2 - goto SeraphLocal00 + goto ScourgeLocal00 SeraphBaseSpecialState1: imgol 1230 0 0 # Seraph cast overlay (red) @@ -6888,32 +6750,32 @@ SeraphBaseSpecialState1: IsId 89 Type 12 Init SeraphTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] -CastSpell InfestedTerranLocal00 +CastSpell ScourgeLocal00 GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # SeraphTurretInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 250 Phalanx (Tank) Base (terran\tank.grp) .headerstart IsId 90 -Type 23 +Type 12 Init Phalanx_Tank_BaseInit Death Phalanx_Tank_BaseDeath GndAttkInit [NONE] @@ -6928,16 +6790,6 @@ Unused2 [NONE] Walking Phalanx_Tank_BaseWalking WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -6973,7 +6825,7 @@ Phalanx_Tank_BaseWalking: IsId 91 Type 13 Init InfestedTerranWalkingToIdle -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit Phalanx_Tank_TurretGndAttkInit AirAttkInit [NONE] Unused1 [NONE] @@ -7009,7 +6861,7 @@ Phalanx_Tank_TurretGndAttkInit: # 253 Phalanx (Siege) Base (terran\stank.grp) .headerstart IsId 92 -Type 23 +Type 14 Init Phalanx_Siege_BaseInit Death Phalanx_Tank_BaseDeath GndAttkInit [NONE] @@ -7026,14 +6878,6 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 Phalanx_Siege_BaseSpecialState2 AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -7105,7 +6949,7 @@ Phalanx_Siege_BaseSpecialState2: IsId 93 Type 14 Init Phalanx_Siege_TurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit Phalanx_Siege_TurretGndAttkInit AirAttkInit [NONE] Unused1 [NONE] @@ -7246,15 +7090,11 @@ FountainheadDeath: FountainheadAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FountainheadLanding: # imgol 1326 0 0 # Vestry connector (cm\terran\medbay-connector.grp) - goto InfestedTerranLocal00 - -FountainheadLiftOff: - wait 125 - goto FountainheadLiftOff + goto ScourgeLocal00 FountainheadIsWorking: playfram 2 @@ -7306,8 +7146,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 StockadeSpecialState1 SpecialState2 [NONE] AlmostBuilt StockadeAlmostBuilt @@ -7327,19 +7167,19 @@ Burrow [NONE] StockadeInit: playfram 0x00 imgul 267 0 0 # Stockade Shadow (terran\tbrShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 StockadeSpecialState1: playfram 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StockadeAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StockadeBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StockadeLanding: nobrkcodestart @@ -7356,7 +7196,7 @@ StockadeLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 StockadeLiftOff: nobrkcodestart @@ -7370,7 +7210,7 @@ StockadeLiftOff: playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 StockadeIsWorking: playfram 7 @@ -7390,7 +7230,7 @@ StockadeIsWorking: goto StockadeIsWorking StockadeDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7416,7 +7256,7 @@ SpecialState2 [NONE] AlmostBuilt AtelierAlmostBuilt Built AtelierBuilt Landing AtelierLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking AtelierIsWorking WorkingToIdle AtelierBuilt WarpIn [NONE] @@ -7427,7 +7267,7 @@ AtelierInit: imgul 270 0 0 # Atelier Shadow (terran\tclShad.grp) AtelierBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtelierDeath: playsnd 7 # Misc\ExploLrg.wav @@ -7445,19 +7285,15 @@ LiftedTerranStructureDeath_Small: AtelierAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtelierLanding: # imgol 1326 0 0 # Vestry connector (cm\terran\medbay-connector.grp) - goto InfestedTerranLocal00 - -AtelierLiftOff: - wait 125 - goto AtelierLiftOff + goto ScourgeLocal00 AtelierIsWorking: imgol 269 0 0 # Atelier Overlay (terran\chemlabT.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7466,7 +7302,7 @@ AtelierIsWorking: IsId 98 Type 24 Init AtelierOverlayInit -Death AtelierOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -7482,14 +7318,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing AtelierOverlayDeath -LiftOff AtelierOverlayDeath +Landing Generic_Wait1End +LiftOff Generic_Wait1End IsWorking AtelierOverlayInit -WorkingToIdle AtelierOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable AtelierOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -7503,10 +7339,6 @@ AtelierOverlayInit: wait 3 goto AtelierOverlayInit -AtelierOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1758 Lodestone (cm\terran\lodestone.grp) @@ -7531,8 +7363,8 @@ SpecialState2 [NONE] AlmostBuilt LodestoneAlmostBuilt Built LodestoneBuilt Landing LodestoneLanding -LiftOff InfestedTerranLocal00 -IsWorking InfestedTerranLocal00 +LiftOff ScourgeLocal00 +IsWorking ScourgeLocal00 WorkingToIdle LodestoneBuilt WarpIn [NONE] .headerend @@ -7541,19 +7373,19 @@ WarpIn [NONE] LodestoneInit: playfram 0x00 imgul 1761 0 0 # Lodestone Shadow (terran\tcsShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 LodestoneAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 LodestoneBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 LodestoneLanding: # imgol 1759 0 0 # Lodestone Connector (terran\ComSatC.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7562,7 +7394,7 @@ LodestoneLanding: IsId 100 Type 24 Init LodestoneConnectorInit -Death LodestoneConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -7578,14 +7410,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing LodestoneConnectorDeath +Landing Generic_Wait1End LiftOff LodestoneConnectorLiftOff IsWorking LodestoneConnectorIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -7599,11 +7431,7 @@ LodestoneConnectorInit: wait 2 LodestoneConnectorIsWorking: playfram 3 - goto InfestedTerranLocal00 - -LodestoneConnectorDeath: - wait 1 - end + goto ScourgeLocal00 LodestoneConnectorLiftOff: playfram 2 @@ -7622,7 +7450,7 @@ LodestoneConnectorLiftOff: IsId 101 Type 24 Init LodestoneOverlayInit -Death LodestoneOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -7639,24 +7467,20 @@ SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] Landing LodestoneOverlayLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking LodestoneOverlayIsWorking WorkingToIdle LodestoneOverlayIsWorking WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # LodestoneOverlayInit: playfram 0x00 - goto InfestedTerranLocal00 - -LodestoneOverlayDeath: - wait 1 - end + goto ScourgeLocal00 LodestoneOverlayLanding: wait 13 @@ -7700,8 +7524,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking MinistryWalking -WalkingToIdle MinistryWalking +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 MinistrySpecialState1 SpecialState2 [NONE] AlmostBuilt MinistryAlmostBuilt @@ -7718,11 +7542,7 @@ MinistryInit: imgul 277 0 0 # Ministry Shadow (terran\tccShad.grp) MinistryBuilt: playfram 0x00 - goto MinistryWalking - -MinistryWalking: - wait 125 - goto MinistryWalking + goto ScourgeLocal00 MinistryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -7735,11 +7555,11 @@ MinistryDeath: MinistrySpecialState1: playfram 4 - goto MinistryWalking + goto ScourgeLocal00 MinistryAlmostBuilt: playfram 1 - goto MinistryWalking + goto ScourgeLocal00 MinistryLanding: nobrkcodestart @@ -7756,7 +7576,7 @@ MinistryLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto MinistryWalking + goto ScourgeLocal00 MinistryLiftOff: nobrkcodestart @@ -7770,7 +7590,7 @@ MinistryLiftOff: playfram 4 sigorder 16 nobrkcodeend - goto MinistryWalking + goto ScourgeLocal00 MinistryIsWorking: playfram 6 @@ -7879,8 +7699,8 @@ AlmostBuilt [NONE] Built CrashedMinotaurBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -7889,14 +7709,14 @@ CrashedMinotaurInit: imgul 300 0 0 # Crashed Minotaur Shadow (neutral\cbaShad.grp) CrashedMinotaurBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 278 Supply Depot (terran\depot.grp) .headerstart IsId 105 -Type 24 +Type 20 Init SupplyDepotInit Death AtelierDeath GndAttkInit [NONE] @@ -7916,24 +7736,20 @@ AlmostBuilt SupplyDepotAlmostBuilt Built SupplyDepotBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 +IsWorking ScourgeLocal00 WorkingToIdle SupplyDepotWorkingToIdle WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # SupplyDepotInit: imgul 280 0 0 # Supply Depot Shadow (terran\tdeShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 SupplyDepotAlmostBuilt: playfram 12 - goto InfestedTerranLocal00 + goto ScourgeLocal00 SupplyDepotBuilt: goto SupplyDepotWorkingToIdle @@ -7971,7 +7787,7 @@ SupplyDepotWorkingToIdle: IsId 106 Type 24 Init SupplyDepotOverlayInit -Death SupplyDepotOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -7994,7 +7810,7 @@ WorkingToIdle SupplyDepotOverlayInit WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8014,10 +7830,6 @@ SupplyDepotOverlayInit: wait 2 goto SupplyDepotOverlayInit -SupplyDepotOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 281 Commandment (terran\DryDocks.grp) @@ -8042,7 +7854,7 @@ SpecialState2 [NONE] AlmostBuilt CommandmentAlmostBuilt Built CommandmentBuilt Landing CommandmentLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking CommandmentIsWorking WorkingToIdle CommandmentBuilt WarpIn [NONE] @@ -8057,22 +7869,22 @@ CommandmentInit: imgul 284 0 0 # Commandment Shadow (terran\tddShad.grp) CommandmentBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CommandmentAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CommandmentLanding: imgol 282 0 0 # Commandment Connector (terran\DryDockC.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 CommandmentIsWorking: imgol 283 0 0 # Commandment Overlay (terran\DryDockT.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 CommandmentDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -8081,7 +7893,7 @@ CommandmentDisable: IsId 108 Type 24 Init CommandmentConnectorInit -Death CommandmentConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8097,14 +7909,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing CommandmentConnectorDeath +Landing Generic_Wait1End LiftOff CommandmentConnectorLiftOff IsWorking CommandmentConnectorIsWorking WorkingToIdle CommandmentConnectorIsWorking WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8120,11 +7932,7 @@ CommandmentConnectorInit: wait 2 CommandmentConnectorIsWorking: playfram 4 - goto InfestedTerranLocal00 - -CommandmentConnectorDeath: - wait 1 - end + goto ScourgeLocal00 CommandmentConnectorLiftOff: playfram 3 @@ -8145,7 +7953,7 @@ CommandmentConnectorLiftOff: IsId 109 Type 24 Init CommandmentOverlayInit -Death CommandmentOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8161,14 +7969,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing CommandmentOverlayDeath -LiftOff CommandmentOverlayDeath +Landing Generic_Wait1End +LiftOff Generic_Wait1End IsWorking CommandmentOverlayIsWorking -WorkingToIdle CommandmentOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable CommandmentOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8182,10 +7990,6 @@ CommandmentOverlayIsWorking: wait 5 goto CommandmentOverlayIsWorking -CommandmentOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 285 Fulcrum (terran\factory.grp) @@ -8203,8 +8007,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking FulcrumWalking -WalkingToIdle FulcrumWalking +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 FulcrumSpecialState1 SpecialState2 [NONE] AlmostBuilt FulcrumAlmostBuilt @@ -8216,7 +8020,7 @@ WorkingToIdle FulcrumBuilt WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable FulcrumWalking +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8224,11 +8028,7 @@ Burrow [NONE] FulcrumInit: playfram 0x00 imgul 287 0 0 # Fulcrum shadow - goto FulcrumWalking - -FulcrumWalking: - wait 125 - goto FulcrumWalking + goto ScourgeLocal00 FulcrumDeath: playsnd 7 @@ -8241,15 +8041,15 @@ FulcrumDeath: FulcrumSpecialState1: playfram 0x16 - goto FulcrumWalking + goto ScourgeLocal00 FulcrumAlmostBuilt: playfram 0x01 - goto FulcrumWalking + goto ScourgeLocal00 FulcrumBuilt: playfram 0x00 - goto FulcrumWalking + goto ScourgeLocal00 FulcrumLanding: nobrkcodestart @@ -8321,7 +8121,7 @@ FulcrumLiftOff: playfram 0x16 sigorder 16 nobrkcodeend - goto FulcrumWalking + goto ScourgeLocal00 FulcrumIsWorking: playfram 0x02 @@ -8345,7 +8145,7 @@ FulcrumIsWorking: IsId 112 Type 24 Init FactoryOverlayInit -Death FactoryOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8355,20 +8155,20 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking FactoryOverlayDeath -WalkingToIdle FactoryOverlayDeath -SpecialState1 FactoryOverlayDeath +Walking Generic_Wait1End +WalkingToIdle Generic_Wait1End +SpecialState1 Generic_Wait1End SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing FactoryOverlayDeath -LiftOff FactoryOverlayDeath +Landing Generic_Wait1End +LiftOff Generic_Wait1End IsWorking FactoryOverlayInit -WorkingToIdle FactoryOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable FactoryOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8382,10 +8182,6 @@ FactoryOverlayInit: wait 5 goto FactoryOverlayInit -FactoryOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 288 Covert Ops (terran\GeneLab.grp) @@ -8410,7 +8206,7 @@ SpecialState2 [NONE] AlmostBuilt CovertOpsAlmostBuilt Built CovertOpsBuilt Landing CovertOpsLanding -LiftOff CovertOpsLiftOff +LiftOff ScourgeLocal00 IsWorking CovertOpsIsWorking WorkingToIdle CovertOpsBuilt WarpIn [NONE] @@ -8421,11 +8217,7 @@ CovertOpsInit: imgul 291 0 0 # Covert Ops Shadow (terran\tglShad.grp) CovertOpsBuilt: playfram 0x00 - goto CovertOpsLiftOff - -CovertOpsLiftOff: - wait 125 - goto CovertOpsLiftOff + goto ScourgeLocal00 CovertOpsDeath: playsnd 7 # Misc\ExploLrg.wav @@ -8433,24 +8225,21 @@ CovertOpsDeath: wait 3 liftoffcondjmp CovertOpsLocal00 lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) - wait 1 - end - CovertOpsLocal00: wait 1 end CovertOpsAlmostBuilt: playfram 1 - goto CovertOpsLiftOff + goto ScourgeLocal00 CovertOpsLanding: imgol 289 0 0 # Covert Ops Connector (terran\GeneLabC.grp) - goto CovertOpsLiftOff + goto ScourgeLocal00 CovertOpsIsWorking: imgol 290 0 0 # Covert Ops Overlay (terran\GeneLabT.grp) - goto CovertOpsLiftOff + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -8459,7 +8248,7 @@ CovertOpsIsWorking: IsId 114 Type 24 Init CovertOpsConnectorInit -Death CovertOpsConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8475,14 +8264,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing CovertOpsConnectorDeath +Landing Generic_Wait1End LiftOff CovertOpsConnectorLiftOff IsWorking CovertOpsConnectorIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8498,11 +8287,7 @@ CovertOpsConnectorInit: wait 2 CovertOpsConnectorIsWorking: playfram 4 - goto InfestedTerranLocal00 - -CovertOpsConnectorDeath: - wait 1 - end + goto ScourgeLocal00 CovertOpsConnectorLiftOff: playfram 3 @@ -8523,7 +8308,7 @@ CovertOpsConnectorLiftOff: IsId 115 Type 24 Init CovertOpsOverlayInit -Death CovertOpsOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8539,14 +8324,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing CovertOpsOverlayDeath -LiftOff CovertOpsOverlayDeath +Landing Generic_Wait1End +LiftOff Generic_Wait1End IsWorking CovertOpsOverlayIsWorking -WorkingToIdle CovertOpsOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable CovertOpsOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8560,10 +8345,6 @@ CovertOpsOverlayIsWorking: wait 5 goto CovertOpsOverlayIsWorking -CovertOpsOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 293 Palladium (terran\machines.grp) @@ -8587,14 +8368,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt MachineShopAlmostBuilt Built MachineShopBuilt -Landing MachineShopLanding -LiftOff MachineShopLanding +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking MachineShopIsWorking WorkingToIdle MachineShopWorkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable MachineShopLanding +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8602,11 +8383,7 @@ Burrow [NONE] MachineShopInit: playfram 0x00 imgul 295 0 0 - goto MachineShopLanding - -MachineShopLanding: - wait 125 - goto MachineShopLanding + goto ScourgeLocal00 MachineShopDeath: playsnd 7 @@ -8614,22 +8391,19 @@ MachineShopDeath: wait 3 liftoffcondjmp MachineShopLocal00 lowsprul 273 0 0 # Terran Building Rubble (small) - wait 1 - end - MachineShopLocal00: wait 1 end MachineShopAlmostBuilt: playfram 0x08 - goto MachineShopLanding + goto ScourgeLocal00 MachineShopBuilt: imgul 294 0 0 # Palladium Connector MachineShopWorkingToIdle: playfram 0x00 - goto MachineShopLanding + goto ScourgeLocal00 MachineShopIsWorking: playfram 0x00 @@ -8657,7 +8431,7 @@ MachineShopIsWorking: IsId 118 Type 24 Init MachineShopConnectorInit -Death MachineShopConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8675,19 +8449,19 @@ AlmostBuilt [NONE] Built [NONE] Landing MachineShopConnectorLanding LiftOff MachineShopConnectorLiftOff -IsWorking MachineShopConnectorIsWorking -WorkingToIdle MachineShopConnectorIsWorking +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable MachineShopConnectorIsWorking +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # MachineShopConnectorInit: playfram 0x07 - goto MachineShopConnectorIsWorking + goto ScourgeLocal00 MachineShopConnectorLanding: playfram 0x06 @@ -8703,15 +8477,7 @@ MachineShopConnectorLanding: playfram 0x01 wait 1 playfram 0x00 - goto MachineShopConnectorIsWorking - -MachineShopConnectorIsWorking: - wait 125 - goto MachineShopConnectorIsWorking - -MachineShopConnectorDeath: - wait 1 - end + goto ScourgeLocal00 MachineShopConnectorLiftOff: playfram 0x01 @@ -8736,14 +8502,14 @@ IsId 119 Type 20 Init Watchdog_Base_Init Death AtelierDeath -GndAttkInit InfestedTerranLocal00 -AirAttkInit InfestedTerranLocal00 +GndAttkInit ScourgeLocal00 +AirAttkInit ScourgeLocal00 Unused1 [NONE] -GndAttkRpt InfestedTerranLocal00 -AirAttkRpt InfestedTerranLocal00 +GndAttkRpt ScourgeLocal00 +AirAttkRpt ScourgeLocal00 CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 -AirAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle ScourgeLocal00 Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] @@ -8753,7 +8519,7 @@ AlmostBuilt Watchdog_Base_AlmostBuilt Built Watchdog_Base_Built Landing Watchdog_Base_Landing LiftOff Watchdog_Base_LiftOff -IsWorking InfestedTerranLocal00 +IsWorking ScourgeLocal00 WorkingToIdle Watchdog_Base_WorkingToIdle WarpIn [NONE] .headerend @@ -8762,11 +8528,11 @@ WarpIn [NONE] Watchdog_Base_Init: playfram 2 imgul 298 0 0 # Watchdog (Base) Shadow (terran\tmiShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 Watchdog_Base_AlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Watchdog_Base_LiftOff: nobrkcodestart @@ -8782,7 +8548,7 @@ Watchdog_Base_LiftOff: # playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 Watchdog_Base_Landing: nobrkcodestart @@ -8800,13 +8566,13 @@ Watchdog_Base_Landing: sigorder 16 nobrkcodeend playfram 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Watchdog_Base_Built: imgol 297 0 0 # Watchdog (Turret) (terran\missileT.grp) Watchdog_Base_WorkingToIdle: playfram 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -8815,7 +8581,7 @@ Watchdog_Base_WorkingToIdle: IsId 120 Type 24 Init Watchdog_Turret_Init -Death Watchdog_Turret_Death +Death Generic_Wait1End GndAttkInit Watchdog_Turret_GndAttkInit AirAttkInit Watchdog_Turret_GndAttkInit Unused1 [NONE] @@ -8829,7 +8595,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built Watchdog_Turret_Built Landing Watchdog_Turret_Landing LiftOff Watchdog_Turret_LiftOff @@ -8838,7 +8604,7 @@ WorkingToIdle Watchdog_Turret_Built WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -8849,10 +8615,6 @@ Watchdog_Turret_Built: wait 1 turn1cwise goto Watchdog_Turret_Built - -Watchdog_Turret_Death: - wait 1 - end Watchdog_Turret_LiftOff: nobrkcodestart @@ -8861,7 +8623,7 @@ Watchdog_Turret_LiftOff: wait 8 wait 8 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 Watchdog_Turret_Landing: nobrkcodestart @@ -8918,11 +8680,7 @@ PhysicsLabInit: imgul 303 0 0 # Physics Lab Shadow (terran\tplShad.grp) PhysicsLabBuilt: playfram 0x00 - goto PhysicsLabLocal00 - -PhysicsLabLocal00: - wait 125 - goto PhysicsLabLocal00 + goto ScourgeLocal00 PhysicsLabDeath: playsnd 7 # Misc\ExploLrg.wav @@ -8930,20 +8688,17 @@ PhysicsLabDeath: wait 3 liftoffcondjmp PhysicsLabLocal01 lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) - wait 1 - end - PhysicsLabLocal01: wait 1 end PhysicsLabAlmostBuilt: playfram 6 - goto PhysicsLabLocal00 + goto ScourgeLocal00 PhysicsLabLanding: imgol 302 0 0 # Physics Lab Connector (terran\physicsC.grp) - goto PhysicsLabLocal00 + goto ScourgeLocal00 PhysicsLabIsWorking: playfram 1 @@ -8965,7 +8720,7 @@ PhysicsLabIsWorking: IsId 122 Type 24 Init PhysicsLabConnectorInit -Death PhysicsLabConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -8981,14 +8736,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing PhysicsLabConnectorDeath +Landing Generic_Wait1End LiftOff PhysicsLabConnectorLiftOff IsWorking PhysicsLabConnectorIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -9004,11 +8759,7 @@ PhysicsLabConnectorInit: wait 2 PhysicsLabConnectorIsWorking: playfram 4 - goto InfestedTerranLocal00 - -PhysicsLabConnectorDeath: - wait 1 - end + goto ScourgeLocal00 PhysicsLabConnectorLiftOff: playfram 3 @@ -9052,7 +8803,7 @@ WorkingToIdle [NONE] WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -9061,7 +8812,7 @@ AnchorInit: imgul 305 0 0 # Anchor Shadow (terran\tpbShad.grp) AnchorBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AnchorLiftOff: nobrkcodestart @@ -9101,7 +8852,7 @@ AnchorLiftOff: playfram 0x12 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 AnchorLanding: nobrkcodestart @@ -9145,7 +8896,7 @@ AnchorLanding: AnchorAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9198,7 +8949,7 @@ AlmostBuilt ReservoirAlmostBuilt Built ReservoirBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 +IsWorking ScourgeLocal00 WorkingToIdle ReservoirBuilt WarpIn [NONE] .headerend @@ -9269,8 +9020,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 DaedalaSpecialState1 SpecialState2 [NONE] AlmostBuilt DaedalaAlmostBuilt @@ -9287,15 +9038,15 @@ DaedalaInit: imgul 311 0 0 # Daedala Shadow (terran\trlShad.grp) DaedalaBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 DaedalaSpecialState1: playfram 5 - goto InfestedTerranLocal00 + goto ScourgeLocal00 DaedalaAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 DaedalaLanding: nobrkcodestart @@ -9310,7 +9061,7 @@ DaedalaLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 DaedalaLiftOff: nobrkcodestart @@ -9324,11 +9075,11 @@ DaedalaLiftOff: playfram 5 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 DaedalaIsWorking: imgol 310 0 0 # Daedala Overlay (terran\ResearcT.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9337,7 +9088,7 @@ DaedalaIsWorking: IsId 127 Type 24 Init DaedalaOverlayInit -Death DaedalaOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9347,20 +9098,20 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking DaedalaOverlayDeath -WalkingToIdle DaedalaOverlayDeath -SpecialState1 DaedalaOverlayDeath +Walking Generic_Wait1End +WalkingToIdle Generic_Wait1End +SpecialState1 Generic_Wait1End SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing DaedalaOverlayDeath -LiftOff DaedalaOverlayDeath +Landing Generic_Wait1End +LiftOff Generic_Wait1End IsWorking DaedalaOverlayIsWorking -WorkingToIdle DaedalaOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable DaedalaOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -9374,10 +9125,6 @@ DaedalaOverlayIsWorking: wait 5 goto DaedalaOverlayIsWorking -DaedalaOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 312 Missile Silo (terran\nukesilo.grp) @@ -9402,7 +9149,7 @@ SpecialState2 [NONE] AlmostBuilt MissileSiloAlmostBuilt Built MissileSiloBuilt Landing MissileSiloLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking MissileSiloIsWorking WorkingToIdle MissileSiloBuilt WarpIn [NONE] @@ -9417,15 +9164,15 @@ MissileSiloInit: imgul 315 0 0 # Nuclear Silo Shadow (terran\tnsShad.grp) MissileSiloBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 MissileSiloAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 MissileSiloLanding: imgol 313 0 0 # Nuclear Silo Connector (terran\NukeSilC.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 MissileSiloIsWorking: playfram 2 @@ -9436,13 +9183,10 @@ MissileSiloIsWorking: MissileSiloUnused3: playfram 2 - goto MissileSiloLocal00 -MissileSiloLocal00: - wait 125 - goto MissileSiloLocal00 + goto ScourgeLocal00 MissileSiloDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9451,7 +9195,7 @@ MissileSiloDisable: IsId 129 Type 24 Init MissileSiloConnectorInit -Death MissileSiloConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9467,14 +9211,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing MissileSiloConnectorDeath +Landing Generic_Wait1End LiftOff MissileSiloConnectorLiftOff IsWorking MissileSiloConnectorIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -9490,11 +9234,7 @@ MissileSiloConnectorInit: wait 2 MissileSiloConnectorIsWorking: playfram 4 - goto InfestedTerranLocal00 - -MissileSiloConnectorDeath: - wait 1 - end + goto ScourgeLocal00 MissileSiloConnectorLiftOff: playfram 3 @@ -9515,7 +9255,7 @@ MissileSiloConnectorLiftOff: IsId 130 Type 24 Init MissileSiloOverlayInit -Death MissileSiloOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9531,14 +9271,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing MissileSiloOverlayDeath -LiftOff MissileSiloOverlayDeath +Landing Generic_Wait1End +LiftOff Generic_Wait1End IsWorking MissileSiloOverlayIsWorking -WorkingToIdle MissileSiloOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable MissileSiloOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -9552,10 +9292,6 @@ MissileSiloOverlayIsWorking: wait 5 goto MissileSiloOverlayIsWorking -MissileSiloOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 316 Nuclear Missile (terran\nukemiss.grp) @@ -9574,7 +9310,7 @@ GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] Walking NuclearMissileWalking -WalkingToIdle InfestedTerranLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 NuclearMissileSpecialState1 SpecialState2 [NONE] AlmostBuilt [NONE] @@ -9589,7 +9325,7 @@ WarpIn NuclearMissileWarpIn NuclearMissileInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 NuclearMissileDeath: imgol 428 0 0 # Nuclear Missile Death (thingy\small.grp) @@ -9614,13 +9350,12 @@ NuclearMissileSpecialState1: tmprmgraphicstart imgol 428 0 0 # Nuclear Missile Death (thingy\small.grp) sprol 267 0 -42 # Nuke Hit (thingy\NukeHit.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 NuclearMissileWarpIn: - wait 125 - wait 125 + wait 250 sigorder 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9629,7 +9364,7 @@ NuclearMissileWarpIn: IsId 133 Type 1 Init NukeExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -9710,8 +9445,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 StarportSpecialState1 SpecialState2 [NONE] AlmostBuilt StarportAlmostBuilt @@ -9728,15 +9463,15 @@ StarportInit: imgul 321 0 0 # Starport Shadow (terran\tspShad.grp) StarportBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarportSpecialState1: playfram 3 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarportAlmostBuilt: playfram 5 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarportLanding: nobrkcodestart @@ -9753,7 +9488,7 @@ StarportLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarportLiftOff: nobrkcodestart @@ -9767,11 +9502,11 @@ StarportLiftOff: playfram 3 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarportIsWorking: imgol 320 0 0 # Starport Overlay (terran\StarpoT.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9780,7 +9515,7 @@ StarportIsWorking: IsId 135 Type 24 Init StarportOverlayInit -Death StarportOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9792,18 +9527,18 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking StarportOverlayInit WalkingToIdle StarportOverlayInit -SpecialState1 StarportOverlayDeath +SpecialState1 Generic_Wait1End SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] Landing StarportOverlayInit LiftOff StarportOverlayInit IsWorking StarportOverlayInit -WorkingToIdle StarportOverlayDeath +WorkingToIdle Generic_Wait1End WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable StarportOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -9817,10 +9552,6 @@ StarportOverlayInit: wait 2 goto StarportOverlayInit -StarportOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 322 Atlas (terran\weaponpl.grp) @@ -9838,15 +9569,15 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 AtlasSpecialState1 SpecialState2 [NONE] AlmostBuilt AtlasAlmostBuilt Built AtlasBuilt Landing AtlasLanding LiftOff AtlasLiftOff -IsWorking InfestedTerranLocal00 +IsWorking ScourgeLocal00 WorkingToIdle AtlasWorkingToIdle WarpIn [NONE] Unused3 [NONE] @@ -9859,21 +9590,21 @@ Burrow [NONE] AtlasInit: playfram 0x00 imgul 324 0 0 # Atlas Shadow (terran\twpShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtlasSpecialState1: playfram 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtlasAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtlasBuilt: imgol 323 0 0 # Atlas Overlay (terran\weaponpT.grp) AtlasWorkingToIdle: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtlasLanding: nobrkcodestart @@ -9890,7 +9621,7 @@ AtlasLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtlasLiftOff: nobrkcodestart @@ -9904,10 +9635,10 @@ AtlasLiftOff: playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 AtlasDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -9916,7 +9647,7 @@ AtlasDisable: IsId 137 Type 24 Init AtlasOverlayInit -Death AtlasOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9926,14 +9657,14 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 -SpecialState1 AtlasOverlayDeath +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 +SpecialState1 Generic_Wait1End SpecialState2 [NONE] AlmostBuilt [NONE] -Built InfestedTerranLocal00 -Landing InfestedTerranLocal00 -LiftOff InfestedTerranLocal00 +Built ScourgeLocal00 +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking AtlasOverlayIsWorking WorkingToIdle AtlasOverlayInit WarpIn [NONE] @@ -9946,11 +9677,7 @@ Burrow [NONE] AtlasOverlayInit: playfram 0x00 - goto InfestedTerranLocal00 - -AtlasOverlayDeath: - wait 1 - end + goto ScourgeLocal00 AtlasOverlayIsWorking: playfram 0x00 @@ -9995,15 +9722,15 @@ AlmostBuilt [NONE] TerranConstruction_Large_Init: playfram 0x00 imgul 326 0 0 # Terran Construction (Large) Shadow (terran\tb2Shad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 TerranConstruction_Large_SpecialState1: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 TerranConstruction_Large_SpecialState2: playfram 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10033,15 +9760,15 @@ AlmostBuilt [NONE] TerranConstruction_Medium_Init: playfram 0x00 imgul 328 0 0 # Terran Construction (Medium) Shadow (terran\tb3Shad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 TerranConstruction_Medium_SpecialState1: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 TerranConstruction_Medium_SpecialState2: playfram 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10071,15 +9798,15 @@ AlmostBuilt [NONE] TerranConstruction_Small_Init: playfram 0x00 imgul 331 0 0 # Terran Construction (Small) Shadow (terran\tb1Shad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 TerranConstruction_Small_SpecialState1: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 TerranConstruction_Small_SpecialState2: playfram 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10100,8 +9827,8 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 InfestedTerranLocal00 -SpecialState2 InfestedTerranLocal00 +SpecialState1 ScourgeLocal00 +SpecialState2 ScourgeLocal00 AlmostBuilt [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -10330,11 +10057,7 @@ DidactGndAttkRpt: playfram 0x00 nobrkcodeend gotorepeatattk - goto DidactLocal00 - -DidactLocal00: - wait 125 - goto DidactLocal00 + goto ScourgeLocal00 DidactCastSpell: nobrkcodestart @@ -10344,7 +10067,7 @@ DidactCastSpell: nobrkcodeend gotorepeatattk sigorder 2 - goto DidactLocal00 + goto ScourgeLocal00 DidactUnused2: nobrkcodestart @@ -10365,11 +10088,11 @@ DidactWalking: playfram 0x00 setvertpos 0 imgol 132 0 0 # Didact Engines (thingy\pabGlow.grp) - goto DidactLocal00 + goto ScourgeLocal00 DidactWarpIn: imgol 133 0 0 # Didact Warp Flash (protoss\didact.grp) - goto DidactLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10513,7 +10236,7 @@ ArchonEnergyLocal00: IsId 148 Type 12 Init ArchonBeingInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit ArchonBeingGndAttkInit AirAttkInit ArchonBeingGndAttkInit Unused1 [NONE] @@ -10611,7 +10334,7 @@ ArchonBeingLocal00: IsId 149 Type 1 Init ArchonSwirlInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -10687,7 +10410,7 @@ WarpIn SolarionWarpIn SolarionInit: imgulnextid 0 42 playfram 0x00 - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 SolarionDeath: playsndbtwn 595 596 # Protoss\Carrier\PCaDth00.WAV | Protoss\Carrier\PCaDth01.WAV @@ -10709,15 +10432,15 @@ SolarionUnused1: setfldirect 14 tmprmgraphicend nobrkcodeend - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 SolarionWalking: imgol 114 0 0 # Solarion Engines (thingy\pcaGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 SolarionWarpIn: imgol 115 0 0 # Solarion Warp Flash (protoss\carrier.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10733,7 +10456,7 @@ Unused1 [NONE] GndAttkRpt DarkTemplar_Hero_GndAttkInit AirAttkRpt [NONE] CastSpell DarkTemplar_Hero_CastSpell -GndAttkToIdle DarkTemplar_Hero_GndAttkToIdle +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking DarkTemplar_Hero_Walking @@ -10744,11 +10467,7 @@ SpecialState1 [NONE] DarkTemplar_Hero_Init: playfram 0xdd - goto DarkTemplar_Hero_GndAttkToIdle - -DarkTemplar_Hero_GndAttkToIdle: - wait 125 - goto DarkTemplar_Hero_GndAttkToIdle + goto ScourgeLocal00 DarkTemplar_Hero_Death: playsnd 741 # Protoss\DARKTEMPLAR\PDTDth00.WAV @@ -10976,11 +10695,7 @@ DracadinWalking: DracadinWarpIn: imgol 125 0 0 # Dracadin Warp Flash (protoss\dragoon.grp) - goto DracadinLocal01 - -DracadinLocal01: - wait 125 - goto DracadinLocal01 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10996,8 +10711,8 @@ Unused1 [NONE] GndAttkRpt StewardGndAttkInit AirAttkRpt StewardGndAttkInit CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 -AirAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle ScourgeLocal00 Unused2 [NONE] Walking StewardWalking WalkingToIdle OvilethLocal00 @@ -11023,12 +10738,12 @@ StewardGndAttkInit: wait 1 playfram 0x00 gotorepeatattk - goto InfestedTerranLocal00 + goto ScourgeLocal00 StewardWalking: playfram 0x00 setvertpos 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11044,11 +10759,11 @@ Unused1 ScribeUnused1 GndAttkRpt ScribeGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking ScribeWalking -WalkingToIdle InfestedTerranLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt ScribeAlmostBuilt @@ -11064,7 +10779,7 @@ WarpIn ScribeWarpIn ScribeInit: imgul 138 0 7 # Scribe Shadow (protoss\probe.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ScribeDeath: setfldirect 0 @@ -11100,7 +10815,7 @@ ScribeUnused1: wait 1 setfldirect 10 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 ScribeGndAttkInit: wait 1 @@ -11112,7 +10827,7 @@ ScribeGndAttkInit: playfram 0x00 nobrkcodeend gotorepeatattk - goto InfestedTerranLocal00 + goto ScourgeLocal00 ScribeWalking: setvertpos 0 @@ -11126,7 +10841,7 @@ ScribeAlmostBuilt: ScribeWarpIn: imgol 139 0 0 # Scribe Warp Flash (protoss\probe.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11177,11 +10892,11 @@ EnvoyWalking: playfram 0x00 setvertpos 0 imgol 120 0 0 # Envoy Engines (thingy\pshGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 EnvoyWarpIn: imgol 121 0 0 # Envoy Warp Flash (protoss\shuttle.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11337,7 +11052,7 @@ CantavisCastSpell: nobrkcodeend gotorepeatattk playfram 0x66 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CantavisUnused2: playfram 0x00 @@ -11383,7 +11098,7 @@ CantavisWalkingToIdle: CantavisWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11420,7 +11135,7 @@ AccantorInit: imgul 145 0 0 # Accantor Shadow (protoss\ptrShad.grp) AccantorWalkingToIdle: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 AccantorDeath: playsnd 638 # Protoss\TRILOBYTE\PTrDth00.WAV @@ -11484,7 +11199,7 @@ AccantorWalking: AccantorWarpIn: imgol 146 0 0 # Accantor Warp Flash (protoss\trilob.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11521,18 +11236,18 @@ PlasmaShellDeath: IsId 162 Type 12 Init ScoutEnginesInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking ScoutEnginesInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -11758,7 +11473,7 @@ ZealotWarpIn: IsId 164 Type 1 Init ZealotDeathInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -11827,11 +11542,11 @@ WitnessDeath: WitnessWalking: playfram 0x00 setvertpos 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WitnessWarpIn: imgol 150 0 0 # Witness Warp Flash (protoss\witness.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11855,7 +11570,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built TemplarArchivesBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking TemplarArchivesIsWorking @@ -11863,21 +11578,17 @@ WorkingToIdle TemplarArchivesWorkingToIdle WarpIn TemplarArchivesWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable TemplarArchivesBuilt +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable TemplarArchivesBuilt +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # TemplarArchivesInit: imgul 157 0 0 # Templar Archives Shadow (protoss\pacShad.grp) playfram 1 - goto TemplarArchivesBuilt - -TemplarArchivesBuilt: - wait 125 - goto TemplarArchivesBuilt + goto ScourgeLocal00 TemplarArchivesDeath: playsnd 7 # Misc\ExploLrg.wav @@ -11908,11 +11619,11 @@ TemplarArchivesIsWorking: TemplarArchivesWorkingToIdle: playfram 1 - goto TemplarArchivesBuilt + goto ScourgeLocal00 TemplarArchivesWarpIn: imgol 156 0 0 # Templar Archives Warp Flash (protoss\archives.grp) - goto TemplarArchivesBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -11944,21 +11655,17 @@ WorkingToIdle AssimilatorBuilt WarpIn AssimilatorWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable AssimilatorDisable +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable AssimilatorDisable +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # AssimilatorInit: imgul 160 0 0 # Assimilator Shadow (protoss\pasShad.grp) playfram 0x00 # Frame set 0 - goto AssimilatorDisable - -AssimilatorDisable: - wait 125 - goto AssimilatorDisable + goto ScourgeLocal00 AssimilatorDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12021,7 +11728,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built ObservatoryBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking ObservatoryIsWorking @@ -12029,21 +11736,17 @@ WorkingToIdle ObservatoryWorkingToIdle WarpIn ObservatoryWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable ObservatoryBuilt +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable ObservatoryBuilt +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # ObservatoryInit: imgul 163 0 0 # Observatory Shadow (protoss\pbeShad.grp) playfram 1 - goto ObservatoryBuilt - -ObservatoryBuilt: - wait 125 - goto ObservatoryBuilt + goto ScourgeLocal00 ObservatoryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12074,18 +11777,18 @@ ObservatoryIsWorking: ObservatoryWorkingToIdle: playfram 1 - goto ObservatoryBuilt + goto ScourgeLocal00 ObservatoryWarpIn: imgol 162 0 0 # Observatory Warp Flash (protoss\beacon.grp) - goto ObservatoryBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # .headerstart IsId 169 Type 20 Init Unknown169Init -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -12138,7 +11841,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built CitadelOfAdunBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking CitadelOfAdunIsWorking @@ -12146,21 +11849,17 @@ WorkingToIdle CitadelOfAdunWorkingToIdle WarpIn CitadelOfAdunWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable CitadelOfAdunBuilt +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable CitadelOfAdunBuilt +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # CitadelOfAdunInit: imgul 166 0 0 # Citadel of Adun Shadow (protoss\pciShad.grp) playfram 0x00 - goto CitadelOfAdunBuilt - -CitadelOfAdunBuilt: - wait 125 - goto CitadelOfAdunBuilt + goto ScourgeLocal00 CitadelOfAdunDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12191,11 +11890,11 @@ CitadelOfAdunIsWorking: CitadelOfAdunWorkingToIdle: playfram 1 - goto CitadelOfAdunBuilt + goto ScourgeLocal00 CitadelOfAdunWarpIn: imgol 165 0 0 # Citadel of Adun Warp Flash (protoss\citadel.grp) - goto CitadelOfAdunBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12223,21 +11922,21 @@ Built ForgeBuilt Landing [NONE] LiftOff [NONE] IsWorking ForgeIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn ForgeWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # ForgeInit: imgul 170 0 0 # Forge Shadow (protoss\pfoShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ForgeDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12248,7 +11947,7 @@ ForgeDeath: end ForgeBuilt: - goto InfestedTerranLocal00 + goto ScourgeLocal00 ForgeIsWorking: wait 1 @@ -12264,7 +11963,7 @@ ForgeIsWorking: ForgeWarpIn: imgol 169 0 0 # Forge Warp Flash (protoss\forge.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12273,7 +11972,7 @@ ForgeWarpIn: IsId 172 Type 27 Init ForgeOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -12292,20 +11991,20 @@ Built [NONE] Landing [NONE] LiftOff [NONE] IsWorking ForgeOverlayIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # ForgeOverlayInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ForgeOverlayIsWorking: playfram 0x00 @@ -12338,7 +12037,7 @@ WalkingToIdle [NONE] SpecialState1 GatewaySpecialState1 SpecialState2 GatewaySpecialState2 AlmostBuilt GatewayAlmostBuilt -Built GatewayBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking GatewayIsWorking @@ -12357,11 +12056,7 @@ GatewayInit: imgul 173 0 0 # Gateway Shadow (protoss\pgaShad.grp) playfram 0x00 wait 2 - goto GatewayBuilt - -GatewayBuilt: - wait 125 - goto GatewayBuilt + goto ScourgeLocal00 GatewayDeath: playfram 0x00 @@ -12387,11 +12082,11 @@ GatewaySpecialState2: GatewayWorkingToIdle: playfram 0x00 - goto GatewayBuilt + goto ScourgeLocal00 GatewayAlmostBuilt: imgol 172 0 0 # Gateway Warp Flash (protoss\gateway.grp) - goto GatewayBuilt + goto ScourgeLocal00 GatewayIsWorking: playfram 1 @@ -12419,7 +12114,7 @@ GatewayDisable: wait 2 playfram 5 wait 1 - goto GatewayBuilt + goto ScourgeLocal00 GatewayEnable: playfram 5 @@ -12454,24 +12149,24 @@ Built CenotaphBuilt Landing [NONE] LiftOff [NONE] IsWorking CenotaphIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn CenotaphWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # CenotaphInit: imgul 177 0 0 # Cenotaph Shadow (protoss\pgcShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CenotaphBuilt: - goto InfestedTerranLocal00 + goto ScourgeLocal00 CenotaphIsWorking: wait 1 @@ -12484,7 +12179,7 @@ CenotaphIsWorking: CenotaphWarpIn: imgol 175 0 0 # Cenotaph Warp Flash (protoss\gencore.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12493,7 +12188,7 @@ CenotaphWarpIn: IsId 175 Type 27 Init CenotaphOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -12512,20 +12207,20 @@ Built [NONE] Landing [NONE] LiftOff [NONE] IsWorking CenotaphOverlayIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # CenotaphOverlayInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CenotaphOverlayIsWorking: playfram 0x00 @@ -12556,11 +12251,11 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built KhaydarinCrystalFormationBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -12568,11 +12263,7 @@ WarpIn [NONE] KhaydarinCrystalFormationInit: imgul 1252 0 0 # Khaydarin Formation Shadow (cm\neutral\khaydarin-formation-shadow.grp) playfram 0x00 - goto KhaydarinCrystalFormationBuilt - -KhaydarinCrystalFormationBuilt: - wait 125 - goto KhaydarinCrystalFormationBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12599,8 +12290,8 @@ AlmostBuilt [NONE] Built NexusBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn NexusWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -12608,7 +12299,7 @@ WarpIn NexusWarpIn NexusInit: imgul 182 0 0 # Nexus Shadow (protoss\pneShad.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 NexusDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12620,11 +12311,11 @@ NexusDeath: NexusBuilt: imgol 181 0 0 # Nexus Overlay (protoss\pneGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 NexusWarpIn: imgol 180 0 0 # Nexus Warp Flash (protoss\nexus.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12633,7 +12324,7 @@ NexusWarpIn: IsId 178 Type 24 Init NexusOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -12653,17 +12344,17 @@ Landing [NONE] LiftOff [NONE] IsWorking NexusOverlayIsWorking WorkingToIdle NexusOverlayInit -WarpIn InfestedTerranLocal00 +WarpIn ScourgeLocal00 Unused3 [NONE] StarEditInit [NONE] -Disable ScourgeExplosionDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # NexusOverlayInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 NexusOverlayIsWorking: playfram 1 @@ -12709,7 +12400,7 @@ StarEditInit [NONE] Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable WardenEnable +Enable InfestedTerranWalkingToIdle .headerend # ----------------------------------------------------------------------------- # @@ -12747,10 +12438,6 @@ WardenGndAttkToIdle: playfram 0x11 wait 2 goto WardenLocal00 - -WardenEnable: - playfram 0x00 - goto ScourgeLocal00 WardenWarpIn: imgol 185 0 0 # Warden Warp Flash (protoss\photon.grp) @@ -12781,8 +12468,8 @@ AlmostBuilt [NONE] Built PylonBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn PylonWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -12844,7 +12531,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built RoboticsFacilityBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking RoboticsFacilityIsWorking @@ -12862,9 +12549,7 @@ Enable RoboticsFacilityEnable RoboticsFacilityInit: imgul 194 0 0 # Robotics Facility Shadow (protoss\proShad.grp) playfram 0x00 -RoboticsFacilityBuilt: - wait 125 - goto RoboticsFacilityBuilt + goto ScourgeLocal00 RoboticsFacilityDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12899,23 +12584,23 @@ RoboticsFacilityIsWorking: RoboticsFacilityWorkingToIdle: playfram 0x00 - goto RoboticsFacilityBuilt + goto ScourgeLocal00 RoboticsFacilityWarpIn: imgol 193 0 0 # Robotics Facility Warp Flash (protoss\robotic.grp) - goto RoboticsFacilityBuilt + goto ScourgeLocal00 RoboticsFacilityDisable: playfram 11 wait 2 playfram 12 - goto RoboticsFacilityBuilt + goto ScourgeLocal00 RoboticsFacilityEnable: playfram 11 wait 2 playfram 0x00 - goto RoboticsFacilityBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12942,12 +12627,12 @@ AlmostBuilt [NONE] Built ShieldBatteryBuilt Landing [NONE] LiftOff [NONE] -IsWorking ShieldBatteryIsWorking -WorkingToIdle ShieldBatteryIsWorking +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn ShieldBatteryWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable ShieldBatteryIsWorking +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] Enable ShieldBatteryBuilt @@ -12957,11 +12642,7 @@ Enable ShieldBatteryBuilt ShieldBatteryInit: imgul 198 0 0 # Shield Battery Shadow (protoss\pbaShad.grp) playfram 0x00 # Frame set 0 - goto ShieldBatteryIsWorking - -ShieldBatteryIsWorking: - wait 125 - goto ShieldBatteryIsWorking + goto ScourgeLocal00 ShieldBatteryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -12971,11 +12652,11 @@ ShieldBatteryDeath: ShieldBatteryBuilt: imgol 196 0 0 # Shield Battery Overlay (protoss\pbaGlow.grp) - goto ShieldBatteryIsWorking + goto ScourgeLocal00 ShieldBatteryWarpIn: imgol 197 0 0 # Shileld Battery Warp Flash (protoss\sbattery.grp) - goto ShieldBatteryIsWorking + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -12984,7 +12665,7 @@ ShieldBatteryWarpIn: IsId 184 Type 24 Init ShieldBatteryOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -13004,17 +12685,17 @@ Landing [NONE] LiftOff [NONE] IsWorking ShieldBatteryOverlayIsWorking WorkingToIdle ShieldBatteryOverlayInit -WarpIn InfestedTerranLocal00 +WarpIn ScourgeLocal00 Unused3 [NONE] StarEditInit [NONE] -Disable ScourgeExplosionDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # ShieldBatteryOverlayInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ShieldBatteryOverlayIsWorking: playsnd 481 # Protoss\Bldg\PbaAct00.wav @@ -13061,12 +12742,12 @@ AlmostBuilt [NONE] Built StargateBuilt Landing [NONE] LiftOff [NONE] -IsWorking StargateIsWorking -WorkingToIdle StargateIsWorking +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn StargateWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable StargateIsWorking +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] Enable StargateBuilt @@ -13076,11 +12757,7 @@ Enable StargateBuilt StargateInit: imgul 202 0 0 # Stargate Shadow (protoss\psgShad.grp) playfram 0x00 - goto StargateIsWorking - -StargateIsWorking: - wait 125 - goto StargateIsWorking + goto ScourgeLocal00 StargateDeath: playsnd 7 # Misc\ExploLrg.wav @@ -13109,11 +12786,11 @@ StargateLocal01: StargateBuilt: imgol 200 0 0 # Stargate Overlay (protoss\psgGlow.grp) - goto StargateIsWorking + goto ScourgeLocal00 StargateWarpIn: imgol 201 0 0 # Stargate Warp Flash (protoss\stargate.grp) - goto StargateIsWorking + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13142,7 +12819,7 @@ Landing [NONE] LiftOff [NONE] IsWorking StargateOverlayIsWorking WorkingToIdle StargateOverlayWorkingToIdle -WarpIn InfestedTerranLocal00 +WarpIn ScourgeLocal00 Unused3 [NONE] StarEditInit [NONE] Disable StargateOverlayDisable @@ -13157,9 +12834,7 @@ StargateOverlayInit: wait 2 StargateOverlayWorkingToIdle: playfram 0x00 -StargateOverlayLocal00: - wait 125 - goto StargateOverlayLocal00 + goto ScourgeLocal00 StargateOverlayIsWorking: playfram 0x00 @@ -13189,7 +12864,7 @@ StargateOverlayDisable: playfram 8 wait 2 tmprmgraphicstart - goto StargateOverlayLocal00 + goto ScourgeLocal00 StargateOverlayDeath: playfram 8 @@ -13221,15 +12896,15 @@ AlmostBuilt [NONE] Built StasisCell_PrisonInit Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # StasisCell_PrisonInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13253,7 +12928,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built RoboticsSupportBayBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking RoboticsSupportBayIsWorking @@ -13261,21 +12936,17 @@ WorkingToIdle RoboticsSupportBayWorkingToIdle WarpIn RoboticsSupportBayWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable RoboticsSupportBayBuilt +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable RoboticsSupportBayBuilt +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # RoboticsSupportBayInit: imgul 206 0 0 # Robotics Support Bay Shadow (protoss\pstShad.grp) playfram 1 - goto RoboticsSupportBayBuilt - -RoboticsSupportBayBuilt: - wait 125 - goto RoboticsSupportBayBuilt + goto ScourgeLocal00 RoboticsSupportBayDeath: playsnd 7 # Misc\ExploLrg.wav @@ -13306,11 +12977,11 @@ RoboticsSupportBayIsWorking: RoboticsSupportBayWorkingToIdle: playfram 1 # Frame set 0, direction 1 - goto RoboticsSupportBayBuilt + goto ScourgeLocal00 RoboticsSupportBayWarpIn: imgol 205 0 0 # Robotics Support Bay Warp Flash (protoss\stasis.grp) - goto RoboticsSupportBayBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13334,11 +13005,11 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built TempleBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -13346,11 +13017,7 @@ WarpIn [NONE] TempleInit: imgul 1228 0 0 # Protoss Temple Shadow (cm\neutral\temple-shadow.grp) playfram 0x00 - goto TempleBuilt - -TempleBuilt: - wait 125 - goto TempleBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13374,7 +13041,7 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built FleetBeaconBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking FleetBeaconIsWorking @@ -13382,21 +13049,17 @@ WorkingToIdle FleetBeaconWorkingToIdle WarpIn FleetBeaconWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable FleetBeaconBuilt +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] -Enable FleetBeaconBuilt +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # FleetBeaconInit: imgul 212 0 0 # Fleet Beacon Shadow (protoss\pwaShad.grp) playfram 1 - goto FleetBeaconBuilt - -FleetBeaconBuilt: - wait 125 - goto FleetBeaconBuilt + goto ScourgeLocal00 FleetBeaconDeath: playsnd 7 # Misc\ExploLrg.wav @@ -13427,18 +13090,18 @@ FleetBeaconIsWorking: FleetBeaconWorkingToIdle: playfram 1 - goto FleetBeaconBuilt + goto ScourgeLocal00 FleetBeaconWarpIn: imgol 209 0 0 # Fleet Beacon Warp Flash (protoss\warp.grp) - goto FleetBeaconBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 211 Warp Anchor (protoss\pb1Glow.grp) .headerstart IsId 191 -Type 27 +Type 15 Init WarpAnchorInit Death WarpAnchorDeath GndAttkInit [NONE] @@ -13455,75 +13118,79 @@ WalkingToIdle [NONE] SpecialState1 WarpAnchorSpecialState1 SpecialState2 WarpAnchorSpecialState1 AlmostBuilt WarpAnchorSpecialState1 -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # WarpAnchorInit: - 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 0x02 + warpoverlay 0x02 + wait 2 + playfram 0x03 + warpoverlay 0x03 + wait 2 + playfram 0x04 + warpoverlay 0x04 + wait 2 + playfram 0x05 + warpoverlay 0x05 + wait 2 + playfram 0x06 + warpoverlay 0x06 + wait 2 + playfram 0x07 + warpoverlay 0x07 + wait 2 WarpAnchorLocal00: - playfram 8 - wait 1 - playfram 9 - wait 1 - playfram 10 - wait 1 - playfram 11 - wait 1 - playfram 12 - wait 1 - playfram 13 - wait 1 - goto WarpAnchorLocal00 + playfram 0x08 + warpoverlay 0x08 + wait 1 + playfram 0x09 + warpoverlay 0x09 + wait 1 + playfram 0x0A + warpoverlay 0x0A + wait 1 + playfram 0x0B + warpoverlay 0x0B + wait 1 + playfram 0x0C + warpoverlay 0x0C + wait 1 + playfram 0x0D + warpoverlay 0x0D + wait 1 + goto WarpAnchorLocal00 WarpAnchorDeath: - playfram 7 - wait 2 - playfram 6 - wait 2 - playfram 5 - wait 2 - playfram 4 - wait 2 - playfram 3 - wait 2 - playfram 2 - wait 2 + playfram 0x07 + warpoverlay 0x07 + wait 2 + playfram 0x06 + warpoverlay 0x06 + wait 2 + playfram 0x05 + warpoverlay 0x05 + wait 2 + playfram 0x04 + warpoverlay 0x04 + wait 2 + playfram 0x03 + warpoverlay 0x03 + wait 2 + playfram 0x02 + warpoverlay 0x02 + wait 2 end WarpAnchorSpecialState1: - playfram 0x00 - wait 2 - playfram 1 - wait 2 - sigorder 1 - goto WarpAnchorLocal01 - -WarpAnchorLocal01: - wait 125 - goto WarpAnchorLocal01 + playfram 0x00 + warpoverlay 0x00 + wait 2 + playfram 0x01 + warpoverlay 0x01 + wait 2 + sigorder 1 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13557,7 +13224,7 @@ WarpAnchorLocal01: IsId 192 Type 1 Init WarpFlashHeaderInit -Death WarpFlashHeaderDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -13565,11 +13232,7 @@ WarpFlashHeaderInit: playfram 0x00 wait 1 followmaingraphic - goto InfestedTerranLocal00 - -WarpFlashHeaderDeath: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -13624,7 +13287,7 @@ WarpTextureInit: warpoverlay 19 sigorder 1 wait 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WarpTextureDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -13658,11 +13321,7 @@ RagnasaurInit: imgul 339 0 0 # Ragnasaur Shadow (neutral\nacShad.grp) RagnasaurGndAttkToIdle: playfram 0x00 - goto RagnasaurLocal00 - -RagnasaurLocal00: - wait 125 - goto RagnasaurLocal00 + goto ScourgeLocal00 RagnasaurDeath: playsndbtwn 276 277 # Maverick death 01, 02 @@ -13763,11 +13422,7 @@ Rhynadon_BadlandsCritter_Init: imgul 341 0 0 # Rhynadon (Badlands) Shadow (neutral\nbcShad.grp) Rhynadon_BadlandsCritter_WalkingToIdle: playfram 0x66 - goto Rhynadon_BadlandsCritter_Local00 - -Rhynadon_BadlandsCritter_Local00: - wait 125 - goto Rhynadon_BadlandsCritter_Local00 + goto ScourgeLocal00 Rhynadon_BadlandsCritter_Death: playsnd 57 # Misc\CRITTERS\BCrDth00.wav @@ -13853,7 +13508,7 @@ Bengalaas_JungleCritter_Init: imgul 343 0 0 # Bengalaas (Jungle) Shadow (neutral\njcShad.grp) Bengalaas_JungleCritter_WalkingToIdle: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Bengalaas_JungleCritter_Death: playsnd 49 # Misc\CRITTERS\JCrDth00.wav @@ -13993,14 +13648,14 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 InfestedTerranLocal00 -SpecialState2 InfestedTerranLocal00 -AlmostBuilt InfestedTerranLocal00 -Built InfestedTerranLocal00 +SpecialState1 ScourgeLocal00 +SpecialState2 ScourgeLocal00 +AlmostBuilt ScourgeLocal00 +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -14008,7 +13663,7 @@ WarpIn [NONE] VespeneGeyser2Init: playframtile 0x00 imgul 346 0 0 # Vespene Geyser Shadow (neutral\geyShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14017,13 +13672,13 @@ VespeneGeyser2Init: IsId 203 Type 1 Init VespeneGeyserShadowInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # VespeneGeyserShadowInit: playframtile 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14032,7 +13687,7 @@ VespeneGeyserShadowInit: IsId 204 Type 20 Init MineralFieldType1Init -Death MineralFieldType1Death +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -14047,46 +13702,34 @@ WalkingToIdle [NONE] SpecialState1 MineralFieldType1SpecialState1 SpecialState2 MineralFieldType1SpecialState2 AlmostBuilt MineralFieldType1AlmostBuilt -Built MineralFieldType1Built +Built InfestedTerranWalkingToIdle Landing MineralFieldType1Landing LiftOff [NONE] IsWorking [NONE] -WorkingToIdle MineralFieldType1Built +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # MineralFieldType1Init: imgul 348 0 0 # Mineral Field Type1 Shadow (neutral\min01Sha.grp) - goto MineralFieldType1Built - -MineralFieldType1Built: - playfram 0x00 - goto MineralFieldType1Local00 - -MineralFieldType1Local00: - wait 125 - goto MineralFieldType1Local00 - -MineralFieldType1Death: - wait 1 - end + goto InfestedTerranWalkingToIdle MineralFieldType1SpecialState1: playfram 3 - goto MineralFieldType1Local00 + goto ScourgeLocal00 MineralFieldType1SpecialState2: playfram 2 - goto MineralFieldType1Local00 + goto ScourgeLocal00 MineralFieldType1AlmostBuilt: playfram 1 - goto MineralFieldType1Local00 + goto ScourgeLocal00 MineralFieldType1Landing: playfram 4 - goto MineralFieldType1Local00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14095,7 +13738,7 @@ MineralFieldType1Landing: IsId 205 Type 20 Init MineralFieldType2Init -Death MineralFieldType2Death +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -14107,49 +13750,21 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 MineralFieldType2SpecialState1 -SpecialState2 MineralFieldType2SpecialState2 -AlmostBuilt MineralFieldType2AlmostBuilt -Built MineralFieldType2Built -Landing MineralFieldType2Landing +SpecialState1 MineralFieldType1SpecialState1 +SpecialState2 MineralFieldType1SpecialState2 +AlmostBuilt MineralFieldType1AlmostBuilt +Built InfestedTerranWalkingToIdle +Landing MineralFieldType1Landing LiftOff [NONE] IsWorking [NONE] -WorkingToIdle MineralFieldType2Built +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # MineralFieldType2Init: imgul 350 0 0 # Mineral Field Type2 Shadow (neutral\min02Sha.grp) - goto MineralFieldType2Built - -MineralFieldType2Built: - playfram 0x00 - goto MineralFieldType2Local00 - -MineralFieldType2Local00: - wait 125 - goto MineralFieldType2Local00 - -MineralFieldType2Death: - wait 1 - end - -MineralFieldType2SpecialState1: - playfram 3 - goto MineralFieldType2Local00 - -MineralFieldType2SpecialState2: - playfram 2 - goto MineralFieldType2Local00 - -MineralFieldType2AlmostBuilt: - playfram 1 - goto MineralFieldType2Local00 - -MineralFieldType2Landing: - playfram 4 - goto MineralFieldType2Local00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14158,7 +13773,7 @@ MineralFieldType2Landing: IsId 206 Type 20 Init MineralFieldType3Init -Death MineralFieldType3Death +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -14170,47 +13785,21 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 MineralFieldType3SpecialState1 -SpecialState2 MineralFieldType3SpecialState2 -AlmostBuilt MineralFieldType3AlmostBuilt -Built MineralFieldType3Built -Landing MineralFieldType3Landing +SpecialState1 MineralFieldType1SpecialState1 +SpecialState2 MineralFieldType1SpecialState2 +AlmostBuilt MineralFieldType1AlmostBuilt +Built InfestedTerranWalkingToIdle +Landing MineralFieldType1Landing LiftOff [NONE] IsWorking [NONE] -WorkingToIdle MineralFieldType3Built +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # MineralFieldType3Init: imgul 352 0 0 # Mineral Field Type3 Shadow (neutral\min03Sha.grp) -MineralFieldType3Built: - playfram 0x00 - goto MineralFieldType3Local00 - -MineralFieldType3Local00: - wait 125 - goto MineralFieldType3Local00 - -MineralFieldType3Death: - wait 1 - end - -MineralFieldType3SpecialState1: - playfram 3 - goto MineralFieldType3Local00 - -MineralFieldType3SpecialState2: - playfram 2 - goto MineralFieldType3Local00 - -MineralFieldType3AlmostBuilt: - playfram 1 - goto MineralFieldType3Local00 - -MineralFieldType3Landing: - playfram 4 - goto MineralFieldType3Local00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14237,15 +13826,15 @@ AlmostBuilt [NONE] Built Unknown207Init Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # Unknown207Init: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Unknown207Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14259,7 +13848,7 @@ Unknown207Death: IsId 208 Type 1 Init ZergBeaconOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -14281,7 +13870,7 @@ ZergBeaconOverlayInit: IsId 209 Type 1 Init TerranBeaconOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -14303,7 +13892,7 @@ TerranBeaconOverlayInit: IsId 210 Type 1 Init ProtossBeaconOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -14325,14 +13914,14 @@ ProtossBeaconOverlayInit: IsId 211 Type 1 Init ZergBeaconInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # ZergBeaconInit: playfram 0x00 imgol 355 0 0 # Zerg Beacon Overlay (zerg\zCirGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14341,14 +13930,14 @@ ZergBeaconInit: IsId 212 Type 1 Init ProtossBeaconInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # ProtossBeaconInit: playfram 0x00 imgol 359 0 0 # Protoss Beacon Overlay (protoss\pCirGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14357,14 +13946,14 @@ ProtossBeaconInit: IsId 213 Type 1 Init TerranBeaconInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # TerranBeaconInit: playfram 0x00 imgol 357 0 0 # Terran Beacon Overlay (terran\tCirGlow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # .headerstart @@ -14377,7 +13966,7 @@ Death Unknown214Death Unknown214Init: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Unknown214Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14404,13 +13993,13 @@ Unknown214Death: IsId 215 Type 1 Init PowerupsShadowHeaderInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # PowerupsShadowHeaderInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14517,7 +14106,7 @@ IsId 218 Type 2 Init BlueBurstLaserInit Death BlueBurstLaserDeath -GndAttkInit BlueBurstLaserGndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -14527,11 +14116,7 @@ BlueBurstLaserInit: wait 1 sigorder 1 wait 1 - goto BlueBurstLaserGndAttkInit - -BlueBurstLaserGndAttkInit: - wait 125 - goto BlueBurstLaserGndAttkInit + goto ScourgeLocal00 BlueBurstLaserDeath: imgol 1105 0 0 # Burst Lasers Hit (Blue) @@ -14556,12 +14141,12 @@ CrystalsShadowsInit: playfram 0x00 pwrupcondjmp CrystalsShadowsLocal00 imgul 413 0 0 # Crystal Shadow (Ground) (neutral\nkhShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 CrystalsShadowsLocal00: wait 1 switchul 414 # Crystal Shadow (Carried) (neutral\nkhSha2.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 CrystalsShadowsDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14738,7 +14323,7 @@ VorvrokorWalking: VorvrokorSpecialState2: playfram 0x110 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 VorvrokorBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -14753,7 +14338,7 @@ VorvrokorBurrow: playfram 0x110 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 VorvrokorUnBurrow: wait 1 @@ -14783,9 +14368,9 @@ Death OreChunkDeath OreChunkInit: playfram 0x00 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 405 0 0 # Mineral Chunk Shadow (neutral\norShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 OreChunkDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14805,13 +14390,9 @@ Death OreChunk2Death OreChunk2Init: playfram 0x11 - pwrupcondjmp OreChunk2Local00 + pwrupcondjmp ScourgeLocal00 imgul 405 0 0 # Mineral Chunk Shadow (neutral\norShad.grp) - goto OreChunk2Local00 - -OreChunk2Local00: - wait 125 - goto OreChunk2Local00 + goto ScourgeLocal00 OreChunk2Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14831,9 +14412,9 @@ Death GasSacDeath GasSacInit: playfram 0x00 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 407 0 0 # Zerg Gas Sac Shadow (neutral\ngsShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 GasSacDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14853,9 +14434,9 @@ Death GasSacDeath GasSac2Init: playfram 0x11 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 407 0 0 # Zerg Gas Sac Shadow (neutral\ngsShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14870,9 +14451,9 @@ Death GasOrbDeath GasOrbInit: playfram 0x00 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 406 0 0 # Protoss Gas Orb Shadow (neutral\ngoShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 GasOrbDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14892,9 +14473,9 @@ Death GasOrbDeath GasOrb2Init: playfram 0x11 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 406 0 0 # Protoss Gas Orb Shadow (neutral\ngoShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14909,9 +14490,9 @@ Death GasTankDeath GasTankInit: playfram 0x00 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 408 0 0 # Terran Gas Tank Shadow (neutral\ngcShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 GasTankDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -14931,9 +14512,9 @@ Death GasTankDeath GasTank2Init: playfram 1 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 408 0 0 # Terran Gas Tank Shadow (neutral\ngcShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -15556,7 +15137,7 @@ IsId 243 Type 2 Init ATA_ATSLaserBattery_BurstLasersInit Death ATA_ATSLaserBattery_BurstLasersDeath -GndAttkInit ATA_ATSLaserBattery_BurstLasersGndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -15566,11 +15147,7 @@ ATA_ATSLaserBattery_BurstLasersInit: wait 1 sigorder 1 wait 1 - goto ATA_ATSLaserBattery_BurstLasersGndAttkInit - -ATA_ATSLaserBattery_BurstLasersGndAttkInit: - wait 125 - goto ATA_ATSLaserBattery_BurstLasersGndAttkInit + goto ScourgeLocal00 ATA_ATSLaserBattery_BurstLasersDeath: imgol 447 0 0 # Burst Lasers Hit (thingy\elbHit.grp) @@ -15592,17 +15169,13 @@ ATA_ATSLaserBattery_BurstLasersDeath2: IsId 244 Type 1 Init Unknown244Init -Death Unknown244Death +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # Unknown244Init: playfram 0x00 - goto InfestedTerranLocal00 - -Unknown244Death: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -15794,7 +15367,7 @@ Lockdown_EMPShockwaveMissileDeath: IsId 250 Type 1 Init PhalanxTankTurretOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -15810,7 +15383,7 @@ PhalanxTankTurretOverlayInit: IsId 251 Type 1 Init PhalanxSiegeTurretOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -15909,7 +15482,7 @@ HallucinationHitInit: playfram 6 wait 2 playfram 7 - wait 2 + wait 1 HallucinationHitDeath: wait 1 end @@ -16039,7 +15612,7 @@ IsId 257 Type 13 Init Venom_Unused_Init Death Venom_Unused_Death -GndAttkInit Venom_Unused_GndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] Unused1 Venom_Unused_Unused1 GndAttkRpt [NONE] @@ -16059,11 +15632,7 @@ Venom_Unused_Init: wait 1 sigorder 1 if bullet.weapon_id == 37 goto Venom_Unused_Unused1 - goto Venom_Unused_GndAttkInit - -Venom_Unused_GndAttkInit: - wait 125 - goto Venom_Unused_GndAttkInit + goto ScourgeLocal00 Venom_Unused_Death: domissiledmg @@ -16075,7 +15644,7 @@ Venom_Unused_Death: Venom_Unused_Unused1: tmprmgraphicstart - goto Venom_Unused_GndAttkInit + goto ScourgeLocal00 Venom_Unused_Unused2: imgol 1097 0 0 # Nathrokor Attack Overlay (cm\effect\nathrokor-breath.grp) @@ -16086,7 +15655,7 @@ Venom_Unused_SpecialState1: playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg - goto Venom_Unused_GndAttkInit + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -16139,7 +15708,7 @@ SubterraneanTentacleDeath: IsId 259 Type 1 Init VenomHit_Unused_Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16211,7 +15780,7 @@ AcidSporeDeath: IsId 261 Type 1 Init AcidSporeHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16249,7 +15818,7 @@ AcidSporeHitInit: IsId 262 Type 1 Init GeszithalorAttackOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16349,7 +15918,7 @@ GlaveWurmSpecialState1: IsId 265 Type 1 Init GlaveWurmHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16436,7 +16005,7 @@ MatralethSpellHolderInit: wait 1 sigorder 1 MatralethSpellHolderGndAttkInit: - goto InfestedTerranLocal00 + goto ScourgeLocal00 MatralethSpellHolderDeath: sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) @@ -16496,7 +16065,7 @@ PsionicShockwaveHitDeath: IsId 269 Type 1 Init GlaveWurmTrailInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16518,7 +16087,7 @@ GlaveWurmTrailInit: IsId 270 Type 1 Init SeekerSporesOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16546,7 +16115,7 @@ SeekerSporesOverlayInit: IsId 271 Type 1 Init AcidSprayInit -Death AcidSprayDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16555,10 +16124,6 @@ AcidSprayInit: wait 1 end -AcidSprayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 420 Plasma Drip (Unused) (thingy\PlasDrip.grp) @@ -16591,7 +16156,7 @@ Unknown272Death: IsId 273 Type 1 Init LongboltHaloGeminiMissilesTrailInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16624,7 +16189,7 @@ LongboltHaloGeminiMissilesTrailInit: IsId 274 Type 1 Init BurrowingDustInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16652,7 +16217,7 @@ BurrowingDustInit: IsId 275 Type 1 Init ShadowHeaderInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16722,9 +16287,6 @@ EnergyPulseUnderlayInit: playfram 11 wait 1 playfram 12 - wait 1 - end - EnergyPulseUnderlayDeath: wait 1 end @@ -16736,7 +16298,7 @@ EnergyPulseUnderlayDeath: IsId 278 Type 1 Init DoubleExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16811,15 +16373,11 @@ NuclearMissileDeathDeath: .headerstart IsId 280 Type 1 -Init SpiderMineExplosionInit +Init ScourgeLocal00 Death SpiderMineExplosionDeath .headerend # ----------------------------------------------------------------------------- # -SpiderMineExplosionInit: - wait 125 - goto SpiderMineExplosionInit - SpiderMineExplosionDeath: playfram 0x00 wait 1 @@ -16854,7 +16412,7 @@ SpiderMineExplosionDeath: IsId 281 Type 1 Init VespeneGeyserSmokesInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16888,7 +16446,7 @@ VespeneGeyserSmokesInit: IsId 282 Type 1 Init Unknown282Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16912,7 +16470,7 @@ Unknown282Init: IsId 283 Type 1 Init FragmentationGrenadeHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -16945,7 +16503,7 @@ FragmentationGrenadeHitInit: IsId 284 Type 1 Init GrenadeShotSmokeInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17008,9 +16566,6 @@ PhaseDisruptor_AntiMatterMissileHitInit: playfram 12 wait 1 playfram 13 - wait 1 - end - PhaseDisruptor_AntiMatterMissileHitDeath: wait 1 end @@ -17022,7 +16577,7 @@ PhaseDisruptor_AntiMatterMissileHitDeath: IsId 286 Type 1 Init PlasmaShell_AntiMatterMissileOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17077,9 +16632,6 @@ PlasmaShellHitInit: playfram 8 wait 1 playfram 9 - wait 1 - end - PlasmaShellHitDeath: wait 1 end @@ -17090,7 +16642,7 @@ PlasmaShellHitDeath: .headerstart IsId 288 Type 2 -Init InfestedTerranLocal00 +Init ScourgeLocal00 Death [NONE] GndAttkInit CursorMarkerGndAttkInit AirAttkInit [NONE] @@ -17109,7 +16661,7 @@ CursorMarkerGndAttkInit: playfram 4 wait 1 __2d - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -17137,8 +16689,8 @@ CursorMarkerGndAttkInit: .headerstart IsId 289 Type 1 -Init InfestedTerranLocal00 -Death InfestedTerranLocal00 +Init ScourgeLocal00 +Death ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -17150,18 +16702,18 @@ Death InfestedTerranLocal00 IsId 290 Type 12 Init SolarionEnginesInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] -GndAttkRpt ScourgeExplosionDeath -AirAttkRpt ScourgeExplosionDeath -CastSpell ScourgeExplosionDeath -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +GndAttkRpt Generic_Wait1End +AirAttkRpt Generic_Wait1End +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking SolarionEnginesInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -17186,21 +16738,21 @@ SolarionEnginesInit: IsId 291 Type 15 Init Engines_GlowHeaderInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] -GndAttkRpt ScourgeExplosionDeath -AirAttkRpt ScourgeExplosionDeath -CastSpell ScourgeExplosionDeath -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +GndAttkRpt Generic_Wait1End +AirAttkRpt Generic_Wait1End +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking Engines_GlowHeaderInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt ScourgeExplosionDeath +AlmostBuilt Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17292,7 +16844,6 @@ ATA_ATSLaserBattery_BurstLasersHitInit: playfram 8 wait 1 playfram 9 - wait 1 ATA_ATSLaserBattery_BurstLasersHitDeath: wait 1 end @@ -17324,7 +16875,6 @@ Unknown295Init: playfram 6 wait 1 playfram 7 - wait 1 Unknown295Death: wait 1 end @@ -17389,7 +16939,7 @@ PlagueCloudDeath: IsId 297 Type 1 Init PlagueOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17533,7 +17083,7 @@ DarkSwarmDeath: IsId 300 Type 1 Init DefensiveMatrixOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17571,7 +17121,7 @@ DefensiveMatrixHitInit: playfram 2 wait 2 playfram 3 - wait 2 + wait 1 DefensiveMatrixHitDeath: wait 1 end @@ -17583,7 +17133,7 @@ DefensiveMatrixHitDeath: IsId 302 Type 1 Init EnsnareInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17630,7 +17180,7 @@ EnsnareInit: IsId 303 Type 1 Init EnsnareOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17658,7 +17208,7 @@ EnsnareOverlayLocal00: IsId 304 Type 1 Init IrradiateInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17684,7 +17234,7 @@ IrradiateInit: IsId 305 Type 1 Init RecallFieldInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17907,7 +17457,7 @@ StasisFieldOverlayDeath: IsId 307 Type 1 Init StasisFieldHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17939,7 +17489,7 @@ StasisFieldHitInit: IsId 308 Type 1 Init RechargeShields_Large_Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -17988,7 +17538,7 @@ RechargeShields_Large_Init: IsId 309 Type 1 Init RechargeShieldsInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18017,7 +17567,7 @@ RechargeShieldsInit: IsId 310 Type 1 Init CantavisGlowInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18037,7 +17587,7 @@ CantavisGlowInit: IsId 311 Type 1 Init NeedleSpinesOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18110,7 +17660,7 @@ FlamethrowerDeath: IsId 313 Type 1 Init GeminiMissilesExplosionInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18216,7 +17766,7 @@ YamatoGunOverlayDeath: IsId 315 Type 1 Init YamatoGunHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18258,7 +17808,7 @@ YamatoGunHitInit: IsId 316 Type 1 Init Unknown316Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18314,7 +17864,7 @@ Unknown316Init: IsId 317 Type 1 Init PsionicStormPartVariant1Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18365,7 +17915,7 @@ PsionicStormPartVariant1Init: IsId 318 Type 1 Init PsionicStormPartVariant2Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18474,9 +18024,9 @@ EMPShockwaveHit_Part2_Init: # 559 Hallucination Death3 (thingy\ehaMed.grp) .headerstart IsId 321 -Type 0 +Type 1 Init HallucinationDeathInit -Death HallucinationDeathDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18509,10 +18059,6 @@ HallucinationDeathInit: wait 3 end -HallucinationDeathDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 450 Flames1 Type1 (Small) (thingy\oFireC.grp) @@ -18615,7 +18161,7 @@ Unknown323Init: IsId 324 Type 1 Init Bleeding_Small_Variant1Init -Death Bleeding_Small_Variant1Death +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18634,10 +18180,6 @@ Bleeding_Small_Variant1Init: wait 2 goto Bleeding_Small_Variant1Init -Bleeding_Small_Variant1Death: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 462 Bleeding Variant2 Type1 (Small) (thingy\bblood01.grp) @@ -18648,7 +18190,7 @@ Bleeding_Small_Variant1Death: IsId 325 Type 1 Init Bleeding_Small_Variant2Init -Death Bleeding_Small_Variant1Death +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18903,17 +18445,13 @@ DustVariant2Init: IsId 332 Type 1 Init ConfirmCircleInit -Death ConfirmCircleDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # ConfirmCircleInit: playfram 0x00 - goto InfestedTerranLocal00 - -ConfirmCircleDeath: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -18922,7 +18460,7 @@ ConfirmCircleDeath: IsId 333 Type 1 Init PsiFieldType1Init -Death PsiFieldType1Death +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -18932,11 +18470,7 @@ PsiFieldType1Init: imgol 585 126 77 # Psi Field1 (Right Lower) (thingy\Juice02.grp) imgol 587 -126 77 # Psi Field2 (Right Lower) (thingy\Juice02.grp) setpos 126 -77 - goto InfestedTerranLocal00 - -PsiFieldType1Death: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -18949,18 +18483,14 @@ PsiFieldType1Death: IsId 334 Type 1 Init PsiFieldType2Init -Death PsiFieldType2Death +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # PsiFieldType2Init: playfram 0x00 setflipstate 1 - goto InfestedTerranLocal00 - -PsiFieldType2Death: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -18975,7 +18505,7 @@ Death [NONE] StartLocationInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19088,7 +18618,7 @@ Death [NONE] DoodadHeaderInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19194,7 +18724,7 @@ Death [NONE] DoodadHeader_secondary_Init: playfram 0x00 imgulnextid 0 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19265,7 +18795,7 @@ SpacePlatformDoodad2Local00: IsId 340 Type 27 Init InstallationDoodadInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -19297,11 +18827,11 @@ Enable InstallationDoodadStarEditInit InstallationDoodadInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InstallationDoodadAlmostBuilt: playfram 9 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InstallationDoodadStarEditInit: playfram 9 @@ -19324,7 +18854,7 @@ InstallationDoodadStarEditInit: wait 2 playfram 0x00 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InstallationDoodadDisable: playfram 0x00 @@ -19347,7 +18877,7 @@ InstallationDoodadDisable: wait 2 playfram 9 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19357,7 +18887,7 @@ InstallationDoodadDisable: IsId 341 Type 27 Init InstallationDoodad2Init -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -19390,12 +18920,12 @@ Enable InstallationDoodad2Enable InstallationDoodad2Init: playfram 0x00 setflipstate 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InstallationDoodad2AlmostBuilt: playfram 9 setflipstate 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InstallationDoodad2Enable: playfram 9 @@ -19419,7 +18949,7 @@ InstallationDoodad2Enable: wait 2 playfram 0x00 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 InstallationDoodad2Disable: playfram 1 @@ -19440,7 +18970,7 @@ InstallationDoodad2Disable: wait 2 playfram 9 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19547,14 +19077,14 @@ Unused1 [NONE] GndAttkRpt FloorMissileTrapGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] SpecialState1 FloorMissileTrapSpecialState1 SpecialState2 FloorMissileTrapSpecialState2 -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built [NONE] Landing [NONE] LiftOff [NONE] @@ -19566,13 +19096,13 @@ StarEditInit [NONE] Disable FloorMissileTrapSpecialState2 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # FloorMissileTrapInit: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorMissileTrapDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -19584,7 +19114,7 @@ FloorMissileTrapGndAttkInit: attackwith 1 gotorepeatattk ignorerest - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorMissileTrapSpecialState1: playfram 1 @@ -19610,7 +19140,7 @@ FloorMissileTrapSpecialState1: playfram 11 imgol 737 0 0 # Floor Missile Trap Turret (thingy\tileset\install\CLPlat1T.grp) sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorMissileTrapSpecialState2: setspawnframe 20 @@ -19642,7 +19172,7 @@ FloorMissileTrapLocal01: wait 2 playfram 1 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19651,14 +19181,14 @@ FloorMissileTrapLocal01: IsId 346 Type 24 Init FloorMissileTrapTurretInit -Death ScourgeExplosionDeath -GndAttkInit InfestedTerranLocal00 +Death Generic_Wait1End +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] Unused1 [NONE] -GndAttkRpt InfestedTerranLocal00 +GndAttkRpt ScourgeLocal00 AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] @@ -19683,19 +19213,15 @@ FloorMissileTrapTurretInit: playfram 0x00 wait 1 setfldirect 20 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorMissileTrapTurretSpecialState2: wait 1 FloorMissileTrapTurretLocal00: - curdirectcondjmp 160 10 FloorMissileTrapTurretLocal01 + curdirectcondjmp 160 10 Generic_Wait1End wait 2 goto FloorMissileTrapTurretLocal00 -FloorMissileTrapTurretLocal01: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 735 Floor Gun Trap (thingy\tileset\install\CLPlate2.grp) @@ -19717,7 +19243,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 FloorGunTrapSpecialState1 SpecialState2 FloorGunTrapSpecialState2 -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built [NONE] Landing [NONE] LiftOff [NONE] @@ -19729,13 +19255,13 @@ StarEditInit [NONE] Disable FloorGunTrapSpecialState2 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # FloorGunTrapInit: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorGunTrapDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -19762,11 +19288,11 @@ FloorGunTrapGndAttkInit: nobrkcodeend gotorepeatattk ignorerest - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorGunTrapGndAttkToIdle: playfram 10 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorGunTrapSpecialState1: playfram 1 @@ -19789,7 +19315,7 @@ FloorGunTrapSpecialState1: wait 2 sigorder 1 playfram 10 - goto InfestedTerranLocal00 + goto ScourgeLocal00 FloorGunTrapSpecialState2: playfram 9 @@ -19810,7 +19336,7 @@ FloorGunTrapSpecialState2: wait 2 playfram 1 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19826,14 +19352,14 @@ Unused1 [NONE] GndAttkRpt WallMissileTrapType1GndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] SpecialState1 WallMissileTrapType1SpecialState1 SpecialState2 WallMissileTrapType1SpecialState2 -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built [NONE] Landing [NONE] LiftOff [NONE] @@ -19845,7 +19371,7 @@ StarEditInit [NONE] Disable WallMissileTrapType1SpecialState2 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -19853,7 +19379,7 @@ WallMissileTrapType1Init: playfram 1 wait 1 setfldirect 12 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallMissileTrapType1Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -19865,7 +19391,7 @@ WallMissileTrapType1GndAttkInit: attackwith 1 gotorepeatattk ignorerest - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallMissileTrapType1SpecialState1: playfram 1 @@ -19880,7 +19406,7 @@ WallMissileTrapType1SpecialState1: wait 2 playfram 6 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallMissileTrapType1SpecialState2: playfram 5 @@ -19893,7 +19419,7 @@ WallMissileTrapType1SpecialState2: wait 2 playfram 1 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19909,14 +19435,14 @@ Unused1 [NONE] GndAttkRpt WallMissileTrapTypet2GndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] SpecialState1 WallMissileTrapTypet2SpecialState1 SpecialState2 WallMissileTrapTypet2SpecialState2 -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built [NONE] Landing [NONE] LiftOff [NONE] @@ -19928,7 +19454,7 @@ StarEditInit [NONE] Disable WallMissileTrapTypet2SpecialState2 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -19937,7 +19463,7 @@ WallMissileTrapTypet2Init: setflipstate 1 wait 1 setfldirect 20 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallMissileTrapTypet2Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -19949,7 +19475,7 @@ WallMissileTrapTypet2GndAttkInit: attackwith 1 gotorepeatattk ignorerest - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallMissileTrapTypet2SpecialState1: playfram 1 @@ -19965,7 +19491,7 @@ WallMissileTrapTypet2SpecialState1: wait 2 playfram 6 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallMissileTrapTypet2SpecialState2: playfram 5 @@ -19978,7 +19504,7 @@ WallMissileTrapTypet2SpecialState2: wait 2 playfram 1 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19994,14 +19520,14 @@ Unused1 [NONE] GndAttkRpt WallFlameTrapType1GndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] SpecialState1 WallFlameTrapType1SpecialState1 SpecialState2 WallFlameTrapType1SpecialState2 -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built [NONE] Landing [NONE] LiftOff [NONE] @@ -20013,7 +19539,7 @@ StarEditInit [NONE] Disable WallFlameTrapType1SpecialState2 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -20021,7 +19547,7 @@ WallFlameTrapType1Init: playfram 1 wait 1 setfldirect 12 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallFlameTrapType1Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -20040,7 +19566,7 @@ WallFlameTrapType1GndAttkInit: attkshiftproj 80 wait 10 ignorerest - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallFlameTrapType1SpecialState1: playfram 1 @@ -20063,7 +19589,7 @@ WallFlameTrapType1SpecialState1: wait 2 playfram 10 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallFlameTrapType1SpecialState2: playfram 9 @@ -20085,7 +19611,7 @@ WallFlameTrapType1SpecialState2: playfram 1 wait 2 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -20101,14 +19627,14 @@ Unused1 [NONE] GndAttkRpt WallFlameTrapType2GndAttkInit AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] SpecialState1 WallFlameTrapType2SpecialState1 SpecialState2 WallFlameTrapType2SpecialState2 -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built [NONE] Landing [NONE] LiftOff [NONE] @@ -20120,7 +19646,7 @@ StarEditInit [NONE] Disable WallFlameTrapType2SpecialState2 Burrow [NONE] UnBurrow [NONE] -Enable InfestedTerranLocal00 +Enable ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -20129,7 +19655,7 @@ WallFlameTrapType2Init: setflipstate 1 wait 1 setfldirect 20 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallFlameTrapType2Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -20148,7 +19674,7 @@ WallFlameTrapType2GndAttkInit: attkshiftproj 80 wait 10 ignorerest - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallFlameTrapType2SpecialState1: playfram 1 @@ -20172,7 +19698,7 @@ WallFlameTrapType2SpecialState1: wait 2 playfram 10 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 WallFlameTrapType2SpecialState2: playfram 9 @@ -20194,7 +19720,7 @@ WallFlameTrapType2SpecialState2: playfram 1 wait 2 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -20313,7 +19839,7 @@ ZergEggAllMutationsGndAttkInit: sigorder 4 wait 2 nobrkcodeend - goto ZergEggAllMutationsLocal01 + goto ScourgeLocal00 ZergEggAllMutationsAirAttkInit: wait 1 @@ -20375,7 +19901,7 @@ ZergEggAllMutationsUnused2: sigorder 4 wait 2 nobrkcodeend - goto ZergEggAllMutationsLocal01 + goto ScourgeLocal00 ZergEggAllMutationsAlmostBuilt: playfram 28 @@ -20420,11 +19946,7 @@ ZergEggAllMutationsCastSpell: ZergEggAllMutationsSpecialState1: sigorder 4 - goto ZergEggAllMutationsLocal01 - -ZergEggAllMutationsLocal01: - wait 125 - goto ZergEggAllMutationsLocal01 + goto ScourgeLocal00 ZergEggAllMutationsWalking: playfram 44 @@ -20475,7 +19997,7 @@ ZergEggAllMutationsSpecialState2: sigorder 4 wait 2 nobrkcodeend - goto ZergEggAllMutationsLocal01 + goto ScourgeLocal00 ZergEggAllMutationsGndAttkToIdle: wait 1 @@ -20701,11 +20223,7 @@ LakiziliskGndAttkRpt: gotorepeatattk ignorerest LakiziliskGndAttkToIdle: - goto LakiziliskLocal03 - -LakiziliskLocal03: - wait 125 - goto LakiziliskLocal03 + goto ScourgeLocal00 LakiziliskWalking: move 4 @@ -20733,7 +20251,7 @@ LakiziliskWalking: LakiziliskSpecialState2: playfram 0x198 - goto LakiziliskLocal03 + goto ScourgeLocal00 LakiziliskBurrow: sigorder 128 @@ -20796,7 +20314,7 @@ LakiziliskBurrow: playfram 0x198 wait 1 sigorder 4 - goto LakiziliskLocal03 + goto ScourgeLocal00 LakiziliskUnBurrow: wait 1 @@ -20818,9 +20336,9 @@ LakiziliskUnBurrow: # 920 Lakizilisk Remnants (zerg\zLurker.grp) .headerstart IsId 356 -Type 0 +Type 1 Init LakiziliskRemnantsInit -Death LakiziliskRemnantsDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -20841,10 +20359,6 @@ LakiziliskRemnantsInit: wait 255 wait 24 end - -LakiziliskRemnantsDeath: - wait 1 - end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -20940,7 +20454,7 @@ VithriliskWalking: IsId 358 Type 13 Init VithriliskBirthInit -Death VithriliskBirthDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -20969,10 +20483,6 @@ VithriliskBirthLocal00: wait 1 goto VithriliskBirthLocal00 -VithriliskBirthDeath: - wait 1 - end - VithriliskBirthSpecialState1: wait 1 nobrkcodestart @@ -20992,7 +20502,7 @@ VithriliskBirthSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -21121,11 +20631,7 @@ ClericCastSpell: nobrkcodeend gotorepeatattk playfram 0x00 - goto ClericLocal03 - -ClericLocal03: - wait 125 - goto ClericLocal03 + goto ScourgeLocal00 ClericWalking: orderdone 1 @@ -21190,7 +20696,7 @@ ClericLocal04: # 1542 Evigrilisk Remains .headerstart IsId 361 -Type 0 +Type 1 Init GenericRemnantsFourInit Death GenericRemnantsFourDeath .headerend @@ -21263,7 +20769,7 @@ ValkyrieWalking: setvertpos 0 imgol 941 0 0 # Valkyrie Engines (thingy\tbmGlow.grp) sigorder 64 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ValkyrieWalkingToIdle: orderdone 64 @@ -21281,11 +20787,7 @@ Death [NONE] Unknown363Init: playframtile 0x00 imgulnextid 0 0 - goto Unknown363Local00 - -Unknown363Local00: - wait 125 - goto Unknown363Local00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -21434,7 +20936,7 @@ MindTyrantEnergyLocal00: IsId 366 Type 12 Init MindTyrantBeingInit -Death MindTyrantBeingDeath +Death Generic_Wait1End GndAttkInit MindTyrantBeingGndAttkInit AirAttkInit MindTyrantBeingGndAttkInit Unused1 [NONE] @@ -21491,10 +20993,6 @@ MindTyrantBeingGndAttkToIdle: wait 4 goto MindTyrantBeingGndAttkToIdle -MindTyrantBeingDeath: - wait 1 - end - MindTyrantBeingGndAttkInit: playfram 0xaa wait 1 @@ -21531,7 +21029,7 @@ MindTyrantBeingCastSpell: IsId 367 Type 1 Init MindTyrantSwirlInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -21698,11 +21196,11 @@ LanifectWalking: playfram 0x00 setvertpos 0 imgol 931 0 0 # Lanifect Engines (cm\protoss\lanifect-engines.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 LanifectWarpIn: imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -21712,18 +21210,18 @@ LanifectWarpIn: IsId 370 Type 12 Init LanifectEnginesInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] -CastSpell ScourgeExplosionDeath -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking LanifectEnginesInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -21778,7 +21276,7 @@ Unknown371Init: playfram 0x22 wait 2 playfram 0x33 - wait 2 + wait 1 Unknown371Death: wait 1 end @@ -21811,11 +21309,7 @@ CabalistInit: playfram 0xdd CabalistGndAttkToIdle: playfram 0xdd - goto CabalistLocal00 - -CabalistLocal00: - wait 125 - goto CabalistLocal00 + goto ScourgeLocal00 CabalistDeath: playsnd 1920 # Cabalist death 01 @@ -22056,21 +21550,17 @@ ExemplarGndAttkInit: playfram 0x00 nobrkcodeend gotorepeatattk - goto ExemplarLocal00 - -ExemplarLocal00: - wait 125 - goto ExemplarLocal00 + goto ScourgeLocal00 ExemplarWalking: playfram 0x00 setvertpos 0 imgol 1202 0 0 # Exemplar Engines (cm\protoss\exemplar-engine.grp) - goto ExemplarLocal00 + goto ScourgeLocal00 ExemplarWarpIn: imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto ExemplarLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -22149,7 +21639,7 @@ OpticalFlareDeath: IsId 380 Type 1 Init SubterraneanSpinesInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22205,7 +21695,7 @@ CorrosiveAcidGndAttkInit: wait 2 playfram 0x33 wait 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CorrosiveAcidDeath: playsnd 72 # Bullet\ZGuHit00.wav @@ -22259,7 +21749,7 @@ CorrosiveAcidHitDeath: IsId 383 Type 1 Init AcidSpores_1_OverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22287,7 +21777,7 @@ AcidSpores_1_OverlayLocal00: IsId 384 Type 1 Init AcidSpores_2_3_OverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22315,7 +21805,7 @@ AcidSpores_2_3_OverlayLocal00: IsId 385 Type 1 Init AcidSpores_4_5_OverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22343,7 +21833,7 @@ AcidSpores_4_5_OverlayLocal00: IsId 386 Type 1 Init AcidSpores_6_9_OverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22382,7 +21872,7 @@ IceDoodadInit: playfram 0x00 setflipstate 1 imgulnextid 0 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -22396,7 +21886,7 @@ IceDoodadInit: IsId 388 Type 1 Init DoodadShadowsHeader_BW_Init -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22450,9 +21940,6 @@ RestorationHitInit: playfram 14 wait 1 playfram 15 - wait 1 - goto RestorationHitDeath - RestorationHitDeath: wait 1 end @@ -22466,7 +21953,7 @@ RestorationHitDeath: IsId 390 Type 1 Init MindControlHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22509,7 +21996,7 @@ MindControlHitInit: wait 1 playfram 18 wait 1 - goto ScourgeExplosionDeath + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -22520,7 +22007,7 @@ MindControlHitInit: IsId 391 Type 1 Init OpticalFlareHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22543,7 +22030,7 @@ OpticalFlareHitInit: wait 1 playfram 8 wait 1 - goto ScourgeExplosionDeath + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -22554,7 +22041,7 @@ OpticalFlareHitInit: IsId 392 Type 1 Init FeedbackInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -22600,7 +22087,7 @@ FeedbackInit: playfram 19 wait 1 playfram 20 - goto ScourgeExplosionDeath + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -22611,7 +22098,7 @@ FeedbackInit: IsId 393 Type 1 Init MaelstromOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -23111,11 +22598,7 @@ WarpIn [NONE] WarpGateInit: imgul 935 0 0 # Warp Gate Shadow (protoss\pwgShad.grp) playfram 0x00 - goto WarpGateLocal00 - -WarpGateLocal00: - wait 125 - goto WarpGateLocal00 + goto ScourgeLocal00 WarpGateDeath: playsnd 7 # Misc\ExploLrg.wav @@ -23131,7 +22614,7 @@ WarpGateAlmostBuilt: WarpGateBuilt: imgol 936 0 0 - goto WarpGateLocal00 + goto ScourgeLocal00 WarpGateIsWorking: playfram 0x00 @@ -23251,7 +22734,7 @@ PsiDisrupterDeath: IsId 409 Type 24 Init WarpGateOverlayInit -Death WarpGateOverlayDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -23274,7 +22757,7 @@ WorkingToIdle WarpGateOverlayInit WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable WarpGateOverlayDeath +Disable Generic_Wait1End Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -23302,10 +22785,6 @@ WarpGateOverlayInit: wait 2 goto WarpGateOverlayInit -WarpGateOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 937 Xel'Naga Temple (protoss\XelTempl.grp) @@ -23327,24 +22806,19 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt XelNagaTempleAlmostBuilt -Built XelNagaTempleBuilt +AlmostBuilt InfestedTerranWalkingToIdle +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] -IsWorking XelNagaTempleIsWorking -WorkingToIdle XelNagaTempleIsWorking +IsWorking InfestedTerranWalkingToIdle +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # XelNagaTempleInit: imgul 938 0 0 # Xel'Naga Temple Shadow (protoss\pxtShad.grp) - playfram 0x00 - goto XelNagaTempleLocal00 - -XelNagaTempleLocal00: - wait 125 - goto XelNagaTempleLocal00 + goto InfestedTerranWalkingToIdle XelNagaTempleDeath: playsnd 7 # Misc\ExploLrg.wav @@ -23354,17 +22828,6 @@ XelNagaTempleDeath: wait 1 end -XelNagaTempleAlmostBuilt: - playfram 0x00 - goto XelNagaTempleBuilt - -XelNagaTempleBuilt: - goto XelNagaTempleLocal00 - -XelNagaTempleIsWorking: - playfram 0x00 - goto XelNagaTempleIsWorking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 998 Maelstrom Hit (thingy\MaelHit.grp) @@ -23372,7 +22835,7 @@ XelNagaTempleIsWorking: IsId 411 Type 1 Init MaelstromHitInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -23638,13 +23101,13 @@ SpecialState2 [NONE] AlmostBuilt QuarryAlmostBuilt Built QuarryBuilt Landing QuarryLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking QuarryIsWorking WorkingToIdle QuarryBuilt WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -23653,11 +23116,11 @@ QuarryInit: imgul 1014 0 0 # Quarry Shadow (cm\terran\quarry-shad.grp) QuarryBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 QuarryAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 QuarryLanding: imgol 1784 0 0 # Quarry Connector (cm\terran\quarry-connector.grp) @@ -23722,7 +23185,7 @@ GorgrokorBirthSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -23795,21 +23258,17 @@ AuroraGndAttkInit: wait 1 playfram 0x00 gotorepeatattk - goto AuroraLocal00 - -AuroraLocal00: - wait 125 - goto AuroraLocal00 + goto ScourgeLocal00 AuroraWalking: playfram 0x00 setvertpos 0 imgol 1199 0 0 # Aurora Engines (cm\protoss\aurora-engine.grp) - goto AuroraLocal00 + goto ScourgeLocal00 AuroraWarpIn: imgol 143 0 0 # Aurora Warp Flash (cm\protoss\aurora.grp) - goto AuroraLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -23875,28 +23334,24 @@ PanoptusGndAttkInit: playfram 0x00 gotorepeatattk ignorerest - goto PanoptusLocal00 - -PanoptusLocal00: - wait 125 - goto PanoptusLocal00 + goto ScourgeLocal00 PanoptusWalking: playfram 0x00 setvertpos 0 imgol 142 0 0 # Panoptus Engines (thingy\pscGlow.grp) - goto PanoptusLocal00 + goto ScourgeLocal00 PanoptusWarpIn: imgol 143 0 0 # Panoptus Warp Flash (cm\protoss\panoptus.grp) - goto PanoptusLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1025 Centaur (terran\centaur.grp) .headerstart IsId 420 -Type 21 +Type 12 Init CentaurInit Death CentaurDeath GndAttkInit CentaurGndAttkInit @@ -23909,16 +23364,8 @@ GndAttkToIdle CentaurGndAttkToIdle AirAttkToIdle CentaurGndAttkToIdle Unused2 CentaurUnused2 Walking CentaurWalking -WalkingToIdle CentaurWalkingToIdle +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -23926,11 +23373,7 @@ CentaurInit: imgul 1026 0 42 # Centaur Shadow (cm\terran\centaur.grp) CentaurGndAttkToIdle: playfram 0x00 # Frame set 0 - goto CentaurWalkingToIdle - -CentaurWalkingToIdle: - wait 125 - goto CentaurWalkingToIdle + goto ScourgeLocal00 CentaurDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav @@ -23966,7 +23409,7 @@ CentaurUnused1: imgol 334 -5 -5 wait 12 nobrkcodeend - goto CentaurWalkingToIdle + goto ScourgeLocal00 CentaurGndAttkInit: wait 1 @@ -23975,17 +23418,13 @@ CentaurGndAttkInit: attack wait 1 gotorepeatattk - goto CentaurWalkingToIdle - -CentaurLocal00: - wait 125 - goto CentaurLocal00 + goto ScourgeLocal00 CentaurWalking: setvertpos 0 imgol 1029 0 0 # Centaur Engine (cm\terran\centaur-engine.grp) imgol 1148 0 0 # Centaur Engine 2 (cm\terran\centaur-engine2.grp) - goto CentaurLocal00 + goto ScourgeLocal00 CentaurUnused2: wait 1 @@ -24001,14 +23440,14 @@ CentaurUnused2: wait 1 nobrkcodeend gotorepeatattk - goto CentaurWalkingToIdle + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1027 Cuirass (cm\terran\cuirass.grp) .headerstart IsId 421 -Type 13 +Type 12 Init CuirassInit Death CuirassDeath GndAttkInit CuirassGndAttkInit @@ -24033,11 +23472,7 @@ CuirassInit: CuirassGndAttkToIdle: playfram 0x22 - goto CuirassLocal00 - -CuirassLocal00: - wait 125 - goto CuirassLocal00 + goto ScourgeLocal00 CuirassDeath: playsndbtwn 1247 1248 # Southpaw death 01, 02 @@ -24199,7 +23634,7 @@ ParasiteOverlayDeath: # 1006 Madrigal Imperioso Mode (cm\terran\madrigal.grp) .headerstart IsId 424 -Type 21 +Type 12 Init MadrigalImperiosoBaseInit Death MadrigalImperiosoBaseDeath GndAttkInit [NONE] @@ -24214,14 +23649,6 @@ Unused2 [NONE] Walking MadrigalImperiosoBaseWalking WalkingToIdle MadrigalImperiosoBaseWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -24230,10 +23657,7 @@ MadrigalImperiosoBaseInit: MadrigalImperiosoBaseWalkingToIdle: setvertpos 0 playfram 0x00 - wait 1 -MadrigalImperiosoBaseLocal00: - wait 125 - goto MadrigalImperiosoBaseLocal00 + goto ScourgeLocal00 MadrigalImperiosoBaseDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV @@ -24255,11 +23679,7 @@ MadrigalImperiosoBaseUnused1: MadrigalImperiosoBaseWalking: setvertpos 0 - goto MadrigalImperiosoBaseLocal01 - -MadrigalImperiosoBaseLocal01: - wait 125 - goto MadrigalImperiosoBaseLocal01 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -24268,7 +23688,7 @@ MadrigalImperiosoBaseLocal01: IsId 747 Type 13 Init MadrigalImperiosoTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit MadrigalImperiosoTurretGndAttkInit AirAttkInit MadrigalImperiosoTurretGndAttkInit Unused1 [NONE] @@ -24286,7 +23706,7 @@ SpecialState1 ScourgeLocal00 MadrigalImperiosoTurretInit: playfram 0x20 - goto MadrigalImperiosoBaseLocal00 + goto ScourgeLocal00 MadrigalImperiosoTurretGndAttkInit: wait 1 @@ -24300,14 +23720,14 @@ MadrigalImperiosoTurretGndAttkInit: wait 1 nobrkcodeend gotorepeatattk - goto MadrigalImperiosoBaseLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1743 Madrigal (Furia) Base (cm\terran\madrigal-base.grp) .headerstart IsId 748 -Type 23 +Type 14 Init MadrigalFuriaBaseInit Death MadrigalImperiosoBaseDeath GndAttkInit [NONE] @@ -24324,14 +23744,6 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 MadrigalFuriaBaseSpecialState2 AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -24379,7 +23791,7 @@ MadrigalFuriaBaseSpecialState2: IsId 749 Type 14 Init MadrigalFuriaTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit MadrigalFuriaTurretGndAttkInit AirAttkInit MadrigalFuriaTurretGndAttkInit Unused1 [NONE] @@ -24669,10 +24081,10 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt ScrapyardAlmostBuilt Built ScrapyardBuilt -Landing ScrapyardLanding -LiftOff InfestedTerranLocal00 +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking ScrapyardIsWorking -WorkingToIdle ScrapyardWorkingToIdle +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] @@ -24686,15 +24098,11 @@ ScrapyardInit: ScrapyardBuilt: imgul 294 0 0 # Palladium Connector playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ScrapyardAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 - -ScrapyardLanding: - wait 125 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ScrapyardDeath: playsnd 7 # Misc\ExploLrg.wav @@ -24716,12 +24124,8 @@ ScrapyardIsWorking: waitrand 2 5 goto ScrapyardIsWorking -ScrapyardWorkingToIdle: - playfram 0x00 - goto ScrapyardLanding - ScrapyardDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25034,7 +24438,7 @@ GrandLibraryInit: imgul 1051 0 0 # Grand Library Shadow (cm\protoss\grandlibrary-shad.grp) GrandLibraryLocal00: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 GrandLibraryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -25046,11 +24450,11 @@ GrandLibraryDeath: GrandLibraryBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 GrandLibraryWarpIn: imgol 1052 0 0 # Grand Library Warp Flash (cm\protoss\grandlibrary.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 GrandLibraryIsWorking: playfram 1 @@ -25064,7 +24468,7 @@ GrandLibraryIsWorking: GrandLibraryDisabled: playfram 3 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25201,7 +24605,7 @@ WarpIn [NONE] TreasuryInit: playfram 0x00 imgul 1057 0 0 # Treasury Shadow (cm\terran\treasury-shad.grp) - goto TreasuryLocal01 + goto ScourgeLocal00 TreasuryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -25209,24 +24613,17 @@ TreasuryDeath: wait 3 liftoffcondjmp TreasuryLocal00 lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) - wait 1 - end - TreasuryLocal00: wait 1 end - -TreasuryLocal01: - wait 125 - goto TreasuryLocal01 TreasuryAlmostBuilt: playfram 20 - goto TreasuryLocal01 + goto ScourgeLocal00 TreasuryBuilt: playfram 0x00 - goto TreasuryLocal01 + goto ScourgeLocal00 TreasuryLanding: nobrkcodestart @@ -25244,7 +24641,7 @@ TreasuryLanding: # playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 TreasuryLiftoff: nobrkcodestart @@ -25259,7 +24656,7 @@ TreasuryLiftoff: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 TreasuryIsWorking: playfram 1 @@ -25350,9 +24747,7 @@ KhaydarinChargeLocal00: playfram 2 wait 2 playfram 1 - wait 2 - goto KhaydarinChargeDeath - + wait 1 KhaydarinChargeDeath: wait 1 end @@ -25381,7 +24776,7 @@ SpecialState2 [NONE] AlmostBuilt RotaryAlmostBuilt Built RotaryBuilt Landing RotaryLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking RotaryIsWorking WorkingToIdle RotaryBuilt WarpIn [NONE] @@ -25396,15 +24791,15 @@ RotaryInit: imgul 1070 0 0 # Rotary Shadow (cm\terran\rotary-shad.grp) RotaryBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 RotaryAlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 RotaryLanding: imgol 1788 0 0 # Rotary Connector (cm\terran\rotary-connector.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 RotaryIsWorking: playfram 2 @@ -25418,7 +24813,7 @@ RotaryIsWorking: goto RotaryIsWorking RotaryDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25578,12 +24973,7 @@ SavantWalking: SavantSpecialState1: playfram 0x00 - wait 1 - goto SavantLocal05 - -SavantLocal05: - wait 125 - goto SavantLocal05 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25620,9 +25010,7 @@ SimulacrumInit: imgul 1072 0 0 # Simulacrum Shadow (protoss\pdrShad.grp) SimulacrumWalkingToIdle: playfram 0x00 -SimulacrumLocal00: - wait 125 - goto SimulacrumLocal00 + goto ScourgeLocal00 SimulacrumDeath: playsndbtwn 1256 1258 # Simulacrum death 01, 02, 03 @@ -25692,11 +25080,7 @@ SimulacrumWalking: SimulacrumWarpIn: imgol 125 0 0 # Simulacrum Warp Flash (protoss\simulacrum.grp) - goto SimulacrumLocal01 - -SimulacrumLocal01: - wait 125 - goto SimulacrumLocal01 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25716,7 +25100,7 @@ GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] Walking PytheanWalking -WalkingToIdle MinotaurGndAttkToIdle +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -25724,7 +25108,7 @@ SpecialState1 [NONE] PytheanInit: imgul 1633 0 42 # Trojan Shadow (cm\terran\pythean.grp) playfram 0x00 - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 PytheanDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav @@ -25737,7 +25121,7 @@ PytheanDeath: PytheanWalking: setvertpos 0 imgol 1734 0 0 # Pythean Engines (cm\terran\pythean-engine.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25860,7 +25244,7 @@ NathrokorWalking: IsId 452 Type 1 Init NathrokorAttackOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -25903,7 +25287,7 @@ GndAttkToIdle EmpyreanGndAttkToIdle AirAttkToIdle EmpyreanGndAttkToIdle Unused2 [NONE] Walking EmpyreanWalking -WalkingToIdle MinotaurGndAttkToIdle +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -25920,7 +25304,7 @@ EmpyreanInit: imgul 1099 0 42 # Empyrean Shadow (protoss\empyrean.grp) EmpyreanGndAttkToIdle: playfram 0x00 - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 EmpyreanDeath: playsndbtwn 3050 3052 # Empyrean death 01, 02, 03 @@ -25945,18 +25329,14 @@ EmpyreanGndAttkInit: gotorepeatattk goto EmpyreanGndAttkToIdle -EmpyreanLocal00: - wait 125 - goto EmpyreanLocal00 - EmpyreanWalking: setvertpos 0 imgol 1203 0 0 # Empyrean Engines (cm\protoss\empyrean-engine.grp) - goto EmpyreanLocal00 + goto ScourgeLocal00 EmpyreanWarpIn: imgol 143 0 0 # Empyrean Warp Flash (protoss\empyrean.grp) - goto EmpyreanLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25990,9 +25370,7 @@ PhaseLinkLocal00: playfram 8 wait 2 playfram 9 - wait 2 - goto PhaseLinkDeath - + wait 1 PhaseLinkDeath: wait 1 end @@ -26037,8 +25415,6 @@ ExemplarLaserImpactLocal00: playfram 13 wait 1 playfram 14 - goto ExemplarLaserImpactDeath - ExemplarLaserImpactDeath: wait 1 end @@ -26334,8 +25710,6 @@ MagicSylonLocal00: playfram 42 wait 1 playfram 43 - goto MagicSylonDeath - MagicSylonDeath: wait 1 end @@ -26603,7 +25977,7 @@ KeskathalorWalking: KeskathalorSpecialState2: playfram 0x165 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 KeskathalorBurrow: setfldirect 14 @@ -26623,7 +25997,7 @@ KeskathalorBurrow: playfram 0x165 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 KeskathalorUnBurrow: wait 1 @@ -26684,7 +26058,7 @@ StarSovereignGndAttkToIdle: StarSovereignWalkingToIdle: setvertpos 0 - goto StarSovereignLocal00 + goto ScourgeLocal00 StarSovereignDeath: playsndbtwn 1393 1395 # Star Sovereign death 01, 02, 03 @@ -26736,11 +26110,7 @@ StarSovereignGndAttkInit: attackwith 1 wait 2 gotorepeatattk - goto StarSovereignLocal00 - -StarSovereignLocal00: - wait 125 - goto StarSovereignLocal00 + goto ScourgeLocal00 StarSovereignCastSpell: wait 1 @@ -26750,157 +26120,61 @@ StarSovereignCastSpell: wait 100 playsnd 1273 # Star Sovereign Grief of All Gods blast 01 imgul 1254 0 60 - wait 6 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - imgul 1253 0 60 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 - wait 6 - sigorder 64 - sigorder 8 - wait 6 - sigorder 16 - wait 6 - sigorder 32 + call StarSovereignLocal01 + call StarSovereignLocal00 + call StarSovereignLocal00 + call StarSovereignLocal00 + call StarSovereignLocal02 + call StarSovereignLocal02 + call StarSovereignLocal02 + call StarSovereignLocal02 + call StarSovereignLocal02 sprul 635 0 60 wait 36 sigorder 4 nobrkcodeend - goto StarSovereignLocal00 + goto ScourgeLocal00 + +StarSovereignLocal00: + imgul 1253 0 60 +StarSovereignLocal01: + wait 6 + goto StarSovereignLocal03 + +StarSovereignLocal02: + imgul 1253 0 60 + wait 6 + sigorder 64 +StarSovereignLocal03: + sigorder 8 + wait 6 + sigorder 16 + wait 6 + sigorder 32 + wait 6 + sigorder 64 + sigorder 8 + wait 6 + sigorder 16 + wait 6 + sigorder 32 + return StarSovereignWalking: setvertpos 0 imgol 1205 0 0 # Star Sovereign Engines (cm\protoss\starsovereign-engine.grp) - goto StarSovereignLocal00 + goto ScourgeLocal00 StarSovereignWarpIn: imgol 143 0 0 # Star Sovereign Warp Flash (protoss\empyrean.grp) - goto StarSovereignLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1117 Apostle (cm\terran\apostle.grp) .headerstart IsId 463 -Type 26 +Type 12 Init ApostleInit Death ApostleDeath GndAttkInit ApostleGndAttkInit @@ -26915,20 +26189,6 @@ Unused2 [NONE] Walking ApostleWalking WalkingToIdle ApostleWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -26936,9 +26196,7 @@ ApostleInit: imgul 1118 0 4 # Apostle Shadow (cm\terran\apostle-shad.grp) ApostleWalkingToIdle: playfram 0x00 -ApostleLocal00: - wait 125 - goto ApostleLocal00 + goto ScourgeLocal00 ApostleDeath: playsnd 1301 # Apostle death 01 @@ -27009,9 +26267,9 @@ ApostleWalking: # 1118 Apostle Remnants (cm\terran\apostle-death.grp) .headerstart IsId 464 -Type 0 +Type 1 Init ApostleRemnantsInit -Death ApostleRemnantsDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -27024,10 +26282,6 @@ ApostleRemnantsInit: wait 24 playfram 2 end - -ApostleRemnantsDeath: - wait 1 - end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27094,31 +26348,26 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt FutureStationAlmostBuilt -Built FutureStationBuilt -Landing FutureStationLanding -LiftOff InfestedTerranLocal00 +Built InfestedTerranWalkingToIdle +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking FutureStationIsWorking -WorkingToIdle FutureStationBuilt +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable FutureStationDisable +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # FutureStationInit: imgul 1121 0 0 # Future Station Shadow (cm\terran\future-station-shadow.grp) -FutureStationBuilt: - playfram 0x00 - goto InfestedTerranLocal00 + goto InfestedTerranWalkingToIdle FutureStationAlmostBuilt: playfram 20 - goto InfestedTerranLocal00 - -FutureStationLanding: - goto InfestedTerranLocal00 + goto ScourgeLocal00 FutureStationIsWorking: playfram 1 @@ -27162,9 +26411,6 @@ FutureStationIsWorking: playfram 0x00 wait 1 goto FutureStationIsWorking - -FutureStationDisable: - goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27188,30 +26434,24 @@ WalkingToIdle [NONE] SpecialState1 ArgosySpecialState1 SpecialState2 ArgosySpecialState2 AlmostBuilt ArgosyAlmostBuilt -Built ArgosyBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking ArgosyIsWorking -WorkingToIdle ArgosyWorkingToIdle +WorkingToIdle InfestedTerranWalkingToIdle WarpIn ArgosyAlmostBuilt Unused3 [NONE] StarEditInit [NONE] -Disable ArgosyDisable +Disable InfestedTerranWalkingToIdle Burrow [NONE] UnBurrow [NONE] -Enable ArgosyEnable +Enable InfestedTerranWalkingToIdle .headerend # ----------------------------------------------------------------------------- # ArgosyInit: imgul 1123 0 0 # Argosy Shadow (cm\protoss\argosy-shad.grp) - playfram 0x00 - wait 2 - goto ArgosyBuilt - -ArgosyBuilt: - wait 125 - goto ArgosyBuilt + goto InfestedTerranWalkingToIdle ArgosyDeath: playfram 0x00 @@ -27224,24 +26464,15 @@ ArgosyDeath: ArgosySpecialState1: playsnd 528 # Protoss\SHUTTLE\pshBld00.wav - wait 1 - goto ArgosyLocal00 - -ArgosyLocal00: - wait 255 - goto ArgosyLocal00 + goto ScourgeLocal00 ArgosySpecialState2: wait 1 - goto ArgosyWorkingToIdle - -ArgosyWorkingToIdle: - playfram 0x00 - goto ArgosyBuilt + goto InfestedTerranWalkingToIdle ArgosyAlmostBuilt: imgol 1124 0 0 # Argosy Warp Flash (cm\protoss\argosy.grp) - goto ArgosyBuilt + goto ScourgeLocal00 ArgosyIsWorking: playfram 1 @@ -27265,16 +26496,6 @@ ArgosyIsWorking: playfram 0x00 wait 2 goto ArgosyIsWorking - -ArgosyDisable: - playfram 0x00 - wait 2 - goto ArgosyBuilt - -ArgosyEnable: - playfram 0x00 - wait 2 - goto ArgosyWorkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27302,7 +26523,7 @@ Built NaniteAssemblyBuilt Landing NaniteAssemblyLanding LiftOff NaniteAssemblyLiftOff IsWorking NaniteAssemblyIsWorking -WorkingToIdle NaniteAssemblyWorkingToIdle +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -27310,11 +26531,7 @@ WarpIn [NONE] NaniteAssemblyInit: playfram 0x00 imgul 1126 0 0 # Nanite Assembly Shadow (cm\terran\naniteassembly-shad.grp) - goto NaniteAssemblyWorkingToIdle - -NaniteAssemblyWorkingToIdle: - wait 125 - goto NaniteAssemblyWorkingToIdle + goto ScourgeLocal00 NaniteAssemblyDeath: playsnd 7 # Misc\ExploLrg.wav @@ -27327,11 +26544,11 @@ NaniteAssemblyDeath: NaniteAssemblyAlmostBuilt: playfram 21 - goto NaniteAssemblyWorkingToIdle + goto ScourgeLocal00 NaniteAssemblyBuilt: playfram 0x00 - goto NaniteAssemblyWorkingToIdle + goto ScourgeLocal00 NaniteAssemblyLanding: nobrkcodestart @@ -27348,7 +26565,7 @@ NaniteAssemblyLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 NaniteAssemblyLiftOff: nobrkcodestart @@ -27364,7 +26581,7 @@ NaniteAssemblyLiftOff: # playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 NaniteAssemblyIsWorking: playfram 1 @@ -27436,7 +26653,7 @@ SpecialState2 [NONE] AlmostBuilt HadronAlmostBuilt Built HadronBuilt Landing HadronLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking HadronIsWorking WorkingToIdle HadronBuilt WarpIn [NONE] @@ -27454,11 +26671,11 @@ HadronInit: HadronLanding: # imgol 294 0 0 # Palladium Connector (terran\machineC.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 HadronAlmostBuilt: playfram 5 - goto InfestedTerranLocal00 + goto ScourgeLocal00 HadronBuilt: playfram 0x00 @@ -27508,7 +26725,7 @@ HadronIsWorking: goto HadronIsWorking HadronDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27540,7 +26757,7 @@ WorkingToIdle CrucibleWorkingToIdle WarpIn CrucibleAlmostBuilt Unused3 [NONE] StarEditInit [NONE] -Disable CrucibleDisable +Disable InfestedTerranWalkingToIdle Burrow [NONE] UnBurrow [NONE] Enable CrucibleEnable @@ -27623,12 +26840,7 @@ CrucibleDeath: CrucibleSpecialState1: playsnd 528 # Protoss\SHUTTLE\pshBld00.wav - wait 1 - goto CrucibleLocal00 - -CrucibleLocal00: - wait 255 - goto CrucibleLocal00 + goto ScourgeLocal00 CrucibleSpecialState2: wait 1 @@ -27643,15 +26855,6 @@ CrucibleAlmostBuilt: imgol 1131 0 0 # Crucible Warp Flash (cm\protoss\crucible.grp) goto CrucibleBuilt -CrucibleDisable: - playfram 0x00 - wait 2 - goto CrucibleLocal02 - -CrucibleLocal02: - wait 125 - goto CrucibleLocal02 - CrucibleEnable: playfram 0x00 wait 2 @@ -27722,21 +26925,17 @@ GladiusGndAttkInit: playfram 0x00 nobrkcodeend gotorepeatattk - goto GladiusLocal00 - -GladiusLocal00: - wait 125 - goto GladiusLocal00 + goto ScourgeLocal00 GladiusWalking: setvertpos 0 imgol 1204 0 0 # Gladius Engines (cm\protoss\gladius-engine.grp) playfram 0x00 - goto GladiusLocal00 + goto ScourgeLocal00 GladiusWarpIn: imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto GladiusLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27812,20 +27011,16 @@ MagisterGndAttkInit: wait 1 nobrkcodeend gotorepeatattk - goto MagisterLocal00 - -MagisterLocal00: - wait 125 - goto MagisterLocal00 + goto ScourgeLocal00 MagisterWalking: playfram 0x00 setvertpos 0 - goto MagisterLocal00 + goto ScourgeLocal00 MagisterWarpIn: imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto MagisterLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27894,28 +27089,24 @@ VassalGndAttkInit: wait 1 nobrkcodeend gotorepeatattk - goto VassalLocal00 - -VassalLocal00: - wait 125 - goto VassalLocal00 + goto ScourgeLocal00 VassalWalking: setvertpos 0 playfram 0x00 imgol 1206 0 0 # Vassal Engines (cm\protoss\vassal-engine.grp) - goto VassalLocal00 + goto ScourgeLocal00 VassalWarpIn: imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto VassalLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1141 Madcap (cm\terran\madcap.grp) .headerstart IsId 475 -Type 13 +Type 12 Init MadcapInit Death MadcapDeath GndAttkInit MadcapGndAttkInit @@ -27937,9 +27128,7 @@ MadcapInit: imgul 1142 0 0 # Madcap Shadow (cm\terran\madcap-shad.grp) MadcapWalkingToIdle: playfram 0x00 -MadcapLocal00: - wait 125 - goto MadcapLocal00 + goto ScourgeLocal00 MadcapDeath: playsndbtwn 276 277 # Terran\MARINE\TMaDth00.WAV | Terran\MARINE\TMaDth01.WAV @@ -28010,7 +27199,7 @@ MadcapWalking: # 1143 Salamander (cm\terran\salamander.grp) .headerstart IsId 476 -Type 21 +Type 12 Init SalamanderInit Death SalamanderDeath GndAttkInit SalamanderGndAttkInit @@ -28025,14 +27214,6 @@ Unused2 [NONE] Walking SalamanderWalking WalkingToIdle SalamanderWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -28077,14 +27258,10 @@ SalamanderGndAttkInit: ignorerest goto SalamanderWalkingToIdle -SalamanderLocal00: - wait 125 - goto SalamanderLocal00 - SalamanderWalking: setvertpos 0 imgol 1166 0 0 # Salamander Engines (cm\terran\salamander-engine.grp) - goto SalamanderLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -28135,7 +27312,7 @@ SalamanderMissileDeath: # 1146 Gorgon (cm\terran\gorgon.grp) .headerstart IsId 478 -Type 21 +Type 12 Init GorgonInit Death GorgonDeath GndAttkInit GorgonGndAttkInit @@ -28150,14 +27327,6 @@ Unused2 [NONE] Walking GorgonWalking WalkingToIdle WraithGndAttkToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -28187,14 +27356,14 @@ GorgonGndAttkInit: GorgonWalking: setvertpos 0 imgol 1198 0 0 # Gorgon Engines (cm\terran\gorgon-engine.grp) - goto WraithLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1150 Phobos (cm\terran\phobos.grp) .headerstart IsId 480 -Type 21 +Type 12 Init PhobosInit Death PhobosDeath GndAttkInit PhobosGndAttkInit @@ -28209,14 +27378,6 @@ Unused2 [NONE] Walking PhobosWalking WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -28741,8 +27902,8 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built SanctumofSorrowBuilt -Landing SanctumofSorrowLanding -LiftOff SanctumofSorrowLanding +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking SanctumofSorrowIsWorking WorkingToIdle SanctumofSorrowBuilt WarpIn SanctumofSorrowWarpIn @@ -28758,11 +27919,7 @@ Enable SanctumofSorrowBuilt SanctumofSorrowInit: playfram 0x00 imgul 1160 0 0 # Sanctum of Sorrow Shadow (cm\protoss\sanctumofsorrow-shad.grp) - goto SanctumofSorrowLanding - -SanctumofSorrowLanding: - wait 125 - goto SanctumofSorrowLanding + goto ScourgeLocal00 SanctumofSorrowDeath: playsnd 7 # Misc\ExploLrg.wav @@ -28774,7 +27931,7 @@ SanctumofSorrowDeath: SanctumofSorrowBuilt: playfram 0x00 - goto SanctumofSorrowLanding + goto ScourgeLocal00 SanctumofSorrowIsWorking: playfram 1 @@ -28788,12 +27945,12 @@ SanctumofSorrowIsWorking: SanctumofSorrowWarpIn: imgol 1161 0 0 # Sanctum of Sorrow Warp Flash (cm\protoss\sanctumofsorrow.grp) - goto SanctumofSorrowLanding + goto ScourgeLocal00 SanctumofSorrowDisable: playfram 3 wait 1 - goto SanctumofSorrowLanding + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -28816,7 +27973,6 @@ WardenHitInit: playfram 6 wait 1 playfram 8 - wait 1 WardenHitDeath: wait 1 end @@ -28864,7 +28020,7 @@ ProtossExplosionSmallInit: playfram 14 wait 2 playfram 15 - wait 2 + wait 1 ProtossExplosionSmallDeath: wait 1 end @@ -28898,7 +28054,7 @@ LastOrdersImpactInit: playfram 7 wait 2 playfram 8 - wait 2 + wait 1 LastOrdersImpactDeath: wait 1 end @@ -28934,7 +28090,6 @@ PhobosLaserImpactInit: playfram 8 wait 1 playfram 9 - wait 1 PhobosLaserImpactDeath: wait 1 end @@ -29193,14 +28348,12 @@ AmaranthInit: imgul 1175 0 -3 # Amaranth Shadow (cm\protoss\amaranth-shad.grp) playfram 0x00 wait 2 -AmaranthLocal69: - wait 125 - goto AmaranthLocal69 + goto ScourgeLocal00 AmaranthGndAttkToIdle: playfram 0x00 wait 2 - goto AmaranthLocal69 + goto ScourgeLocal00 AmaranthDeath: playsnd 741 # Protoss\DARKTEMPLAR\PDTDth00.WAV @@ -29265,7 +28418,7 @@ AmaranthCastSpell: playfram 0x11 wait 1 gotorepeatattk - goto InfestedTerranLocal00 + goto ScourgeLocal00 AmaranthWalking: move 4 @@ -29299,11 +28452,11 @@ AmaranthWalking: AmaranthWalkingToIdle: playfram 0x00 - goto AmaranthLocal69 + goto ScourgeLocal00 AmaranthWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -29451,7 +28604,7 @@ GndAttkToIdle EcclesiastGndAttkToIdle AirAttkToIdle EcclesiastGndAttkToIdle Unused2 [NONE] Walking EcclesiastWalking -WalkingToIdle EcclesiastWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -29468,15 +28621,7 @@ EcclesiastInit: imgul 1172 0 0 # Ecclesiast Shadow (cm\protoss\ecclesiast-shad.grp) playfram 0x00 wait 2 - goto EcclesiastLocal69 - -EcclesiastLocal42: - playfram 0x00 - goto EcclesiastLocal69 - -EcclesiastLocal69: - wait 125 - goto EcclesiastLocal69 + goto ScourgeLocal00 EcclesiastGndAttkToIdle: playfram 0x180 @@ -29487,9 +28632,7 @@ EcclesiastGndAttkToIdle: wait 1 playfram 0x120 wait 1 - playfram 0x00 - wait 1 - goto EcclesiastLocal69 + goto InfestedTerranWalkingToIdle EcclesiastDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV @@ -29508,7 +28651,7 @@ EcclesiastUnused1: wait 12 setfldirect 12 nobrkcodeend - goto EcclesiastLocal42 + goto InfestedTerranWalkingToIdle EcclesiastGndAttkInit: playfram 0x120 @@ -29559,14 +28702,10 @@ EcclesiastWalking: wait 1 playfram 0xE0 goto EcclesiastWalking - -EcclesiastWalkingToIdle: - playfram 0x00 - goto EcclesiastLocal69 EcclesiastWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -29594,17 +28733,13 @@ SpecialState1 [NONE] IdolInit: imgul 1183 0 0 # Idol Shadow (idol-shad.grp) playfram 0x77 - goto IdolLocal00 + goto ScourgeLocal00 IdolGndAttkToIdle: playfram 0x88 wait 1 playfram 0x77 - goto IdolLocal00 - -IdolLocal00: - wait 125 - goto IdolLocal00 + goto ScourgeLocal00 IdolDeath: playsndbtwn 3053 3056 # Idol death 01, 02, 03, 04 @@ -29685,21 +28820,17 @@ SpecialState1 [NONE] GolemInit: imgul 1185 0 0 # Golem Shadow (golem-shad.grp) playfram 0x00 - goto GolemLocal00 + goto ScourgeLocal00 GolemGndAttkToIdle: playfram 0x99 wait 1 playfram 0x00 - goto GolemLocal00 + goto ScourgeLocal00 GolemWalkingToIdle: playfram 0x00 - goto GolemLocal00 - -GolemLocal00: - wait 125 - goto GolemLocal00 + goto ScourgeLocal00 GolemDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV @@ -29873,7 +29004,7 @@ WalkingToIdle [NONE] SpecialState1 SyntheticSynodSpecialState1 SpecialState2 SyntheticSynodSpecialState2 AlmostBuilt SyntheticSynodAlmostBuilt -Built SyntheticSynodBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking SyntheticSynodIsWorking @@ -29892,11 +29023,7 @@ SyntheticSynodInit: imgul 1189 0 0 # Synthetic Synod Shadow (cm\protoss\synthetic-synod-shadow.grp) playfram 0x00 wait 2 - goto SyntheticSynodBuilt - -SyntheticSynodBuilt: - wait 125 - goto SyntheticSynodBuilt + goto ScourgeLocal00 SyntheticSynodDeath: playfram 0x00 @@ -29909,12 +29036,7 @@ SyntheticSynodDeath: SyntheticSynodSpecialState1: playsnd 528 # Protoss\SHUTTLE\pshBld00.wav - wait 1 - goto SyntheticSynodLocal00 - -SyntheticSynodLocal00: - wait 255 - goto SyntheticSynodLocal00 + goto ScourgeLocal00 SyntheticSynodSpecialState2: wait 1 @@ -29922,11 +29044,11 @@ SyntheticSynodSpecialState2: SyntheticSynodWorkingToIdle: playfram 0x00 - goto SyntheticSynodBuilt + goto ScourgeLocal00 SyntheticSynodAlmostBuilt: imgol 1190 0 0 # Synthetic Synod Warp Flash (cm\protoss\synthetic-synod.grp) - goto SyntheticSynodBuilt + goto ScourgeLocal00 SyntheticSynodIsWorking: playfram 1 @@ -29971,8 +29093,7 @@ SyntheticSynodIsWorking: SyntheticSynodDisable: playfram 0x00 - wait 2 - goto SyntheticSynodBuilt + goto ScourgeLocal00 SyntheticSynodEnable: playfram 0x00 @@ -30014,10 +29135,7 @@ PariahInit: imgul 1192 0 2 # Pariah Shadow (cm\protoss\pariah-shadow.grp) PariahWalkingToIdle: playfram 0xdd - wait 1 -PariahLocal00: - wait 125 - goto PariahLocal00 + goto ScourgeLocal00 PariahDeath: playsndbtwn 1242 1245 # Pariah death 01, 02, 03 @@ -30103,7 +29221,7 @@ PariahWalking: PariahWarpIn: imgol 125 0 0 # Pariah Warp Flash (protoss\pariah.grp) - goto PariahLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -30172,14 +29290,10 @@ TalosGndAttkRpt: nobrkcodeend gotorepeatattk goto TalosGndAttkToIdle - -TalosLocal42: - wait 125 - goto TalosLocal42 TalosWalking: setvertpos 0 - goto TalosLocal42 + goto ScourgeLocal00 TalosAlmostBuilt: setvertpos 0 @@ -30488,11 +29602,7 @@ BactaliskWalking: BactaliskSpecialState2: playfram 280 # Frame set 16, direction 8 - goto BactaliskLocal04 - -BactaliskLocal04: - wait 125 - goto BactaliskLocal04 + goto ScourgeLocal00 BactaliskBurrow: setfldirect 14 @@ -30514,7 +29624,7 @@ BactaliskBurrow: playfram 0x220 wait 1 sigorder 4 - goto BactaliskLocal04 + goto ScourgeLocal00 BactaliskUnBurrow: wait 1 @@ -30558,15 +29668,15 @@ WalkingToIdle [NONE] SpecialState1 PennantSpecialState1 SpecialState2 PennantSpecialState2 AlmostBuilt PennantAlmostBuilt -Built PennantBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] IsWorking PennantIsWorking -WorkingToIdle PennantWorkingToIdle +WorkingToIdle InfestedTerranWalkingToIdle WarpIn PennantAlmostBuilt Unused3 [NONE] StarEditInit [NONE] -Disable PennantDisable +Disable InfestedTerranWalkingToIdle Burrow [NONE] UnBurrow [NONE] Enable PennantEnable @@ -30575,13 +29685,7 @@ Enable PennantEnable PennantInit: imgul 1209 0 0 # Pennant Shadow (cm\protoss\pennant-shad.grp) - playfram 0x00 - wait 1 - goto PennantBuilt - -PennantBuilt: - wait 125 - goto PennantBuilt + goto InfestedTerranWalkingToIdle PennantDeath: playfram 0x00 @@ -30594,25 +29698,15 @@ PennantDeath: PennantSpecialState1: playsnd 528 # Protoss\SHUTTLE\pshBld00.wav - wait 1 - goto PennantLocal00 - -PennantLocal00: - wait 255 - goto PennantLocal00 + goto ScourgeLocal00 PennantSpecialState2: wait 1 - goto PennantWorkingToIdle - -PennantWorkingToIdle: - playfram 0x00 - wait 1 - goto PennantBuilt + goto InfestedTerranWalkingToIdle PennantAlmostBuilt: imgol 1210 0 0 # Pennant Warp Flash (cm\protoss\pennant.grp) - goto PennantBuilt + goto ScourgeLocal00 PennantIsWorking: playfram 1 @@ -30637,19 +29731,10 @@ PennantIsWorking: wait 2 goto PennantIsWorking -PennantDisable: - playfram 0x00 # Frame set 0 - wait 2 - goto PennantLocal02 - -PennantLocal02: - wait 125 - goto PennantLocal02 - PennantEnable: playfram 0x00 # Frame set 0 wait 2 - goto PennantWorkingToIdle + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -31079,7 +30164,7 @@ ArchitectGndAttkToIdle: ArchitectWalkingToIdle: setvertpos 0 - goto ArchitectLocal00 + goto ScourgeLocal00 ArchitectDeath: playsnd 1334 # Architect death 01 @@ -31103,11 +30188,7 @@ ArchitectGndAttkInit: wait 2 nobrkcodeend gotorepeatattk - goto ArchitectLocal00 - -ArchitectLocal00: - wait 125 - goto ArchitectLocal00 + goto ScourgeLocal00 ArchitectWalking: setvertpos 0 @@ -31121,7 +30202,7 @@ ArchitectWalking2: ArchitectWarpIn: imgol 143 0 0 # Architect Warp Flash (protoss\empyrean.grp) - goto ArchitectLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -31171,7 +30252,7 @@ KalkaliskBirthSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -31221,7 +30302,7 @@ IrolethBirthSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -31312,7 +30393,7 @@ IsId 518 Type 2 Init BurstLasersSilentInit Death BurstLasersSilentDeath -GndAttkInit BurstLasersSilentGndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -31322,11 +30403,7 @@ BurstLasersSilentInit: wait 1 sigorder 1 wait 1 - goto BurstLasersSilentGndAttkInit - -BurstLasersSilentGndAttkInit: - wait 125 - goto BurstLasersSilentGndAttkInit + goto ScourgeLocal00 BurstLasersSilentDeath: imgol 1248 0 0 # Burst Lasers Hit Damaging (thingy\elbHit.grp) @@ -31381,15 +30458,13 @@ ObservanceCastDeath: IsId 520 Type 1 Init ObservanceInit -Death ObservanceDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # ObservanceInit: playfram 0x00 wait 2 - goto ObservanceLocal00 - ObservanceLocal00: playfram 1 wait 2 @@ -31467,10 +30542,6 @@ ObservanceLocal00: playfram 37 wait 2 goto ObservanceLocal00 - -ObservanceDeath: - wait 1 - end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -31564,7 +30635,7 @@ KalkaliskSporesAirAttkInit: IsId 523 Type 1 Init RecallFieldFinInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -31744,7 +30815,7 @@ BurstLasersImpactDeath: IsId 527 Type 1 Init PlanetCrackerCastEffectInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -31960,7 +31031,7 @@ PlanetCrackerCastEffectInit: IsId 528 Type 1 Init PlanetCrackerBeamInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -32017,7 +31088,7 @@ PlanetCrackerBeamInit: IsId 529 Type 1 Init PlanetCrackerBlastLoopInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -32231,7 +31302,7 @@ PlanetCrackerBlastLoopInit: IsId 530 Type 1 Init PlanetCrackerBlastInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -32465,12 +31536,12 @@ AlmostBuilt IonCannonBaseAlmostBuilt Built IonCannonBaseBuilt Landing IonCannonBaseLanding LiftOff IonCannonBaseLiftOff -IsWorking IonCannonBaseIsWorking -WorkingToIdle IonCannonBaseIsWorking +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable IonCannonBaseIsWorking +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -32479,9 +31550,7 @@ IonCannonBaseInit: playfram 0x00 imgul 1258 -27 0 # Ion Cannon shadow imgul 1452 0 0 # Ion Cannon mouse response -IonCannonBaseIsWorking: - wait 125 - goto IonCannonBaseIsWorking + goto ScourgeLocal00 IonCannonBaseDeath: playsnd 7 @@ -32507,18 +31576,18 @@ IonCannonBaseGndAttkRpt: sproluselo 755 0 # ioncannon-attack-B nobrkcodeend gotorepeatattk - goto IonCannonBaseIsWorking + goto ScourgeLocal00 IonCannonBaseGndAttkToIdle: playfram 0x20 wait 3 playfram 0x00 - goto IonCannonBaseIsWorking + goto ScourgeLocal00 IonCannonBaseAlmostBuilt: playfram 0xCC setfldirect 20 - goto IonCannonBaseIsWorking + goto ScourgeLocal00 IonCannonBaseLiftOff: nobrkcodestart @@ -32534,7 +31603,7 @@ IonCannonBaseLiftOff: playfram 0xC0 sigorder 16 nobrkcodeend - goto IonCannonBaseIsWorking + goto ScourgeLocal00 IonCannonBaseLanding: nobrkcodestart @@ -32550,7 +31619,7 @@ IonCannonBaseLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto IonCannonBaseIsWorking + goto ScourgeLocal00 IonCannonBaseBuilt: playfram 0x00 @@ -32562,7 +31631,7 @@ IonCannonBaseBuilt: imgol 1702 127 127 # ioncannon-attack-A4 imgol 1256 -1 -38 # ioncannon-turret setfldirect 20 - goto IonCannonBaseIsWorking + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -32779,7 +31848,7 @@ IsId 534 Type 2 Init BurstLasersExplosiveInit Death BurstLasersExplosiveDeath -GndAttkInit BurstLasersExplosiveGndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -32789,11 +31858,7 @@ BurstLasersExplosiveInit: wait 1 sigorder 1 wait 1 - goto BurstLasersExplosiveGndAttkInit - -BurstLasersExplosiveGndAttkInit: - wait 125 - goto BurstLasersExplosiveGndAttkInit + goto ScourgeLocal00 BurstLasersExplosiveDeath: imgol 1245 0 0 # Arclite Shock Cannon Hit Silent (thingy\mushroom.grp) @@ -33039,35 +32104,9 @@ KhaydarinEclipseProtossAccelerantDeath: # 1276 Lobotomy Mine (cm\terran\lobotomymine.grp) .headerstart IsId 539 -Type 26 +Type 0 Init [NONE] Death [NONE] -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 [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -33077,15 +32116,11 @@ Enable [NONE] .headerstart IsId 540 Type 1 -Init LobotomyMineExplosionInit +Init ScourgeLocal00 Death LobotomyMineExplosionDeath .headerend # ----------------------------------------------------------------------------- # -LobotomyMineExplosionInit: - wait 125 - goto LobotomyMineExplosionInit - LobotomyMineExplosionDeath: playsnd 1309 playfram 0x00 @@ -33360,7 +32395,7 @@ IonFieldDeath: IsId 544 Type 1 Init EnsnaringBroodOverlayInit -Death EnsnaringBroodOverlayDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -33414,10 +32449,6 @@ EnsnaringBroodOverlayLocal00: playfram 12 goto EnsnaringBroodOverlayLocal00 -EnsnaringBroodOverlayDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1200 Ion Cannon Projectile (cm\effect\ioncannon-projectile.grp) @@ -33690,11 +32721,7 @@ QuaziliskWalking: QuaziliskSpecialState2: playfram 0x1E0 - goto QuaziliskLocal07 - -QuaziliskLocal07: - wait 125 - goto QuaziliskLocal07 + goto ScourgeLocal00 QuaziliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -33710,7 +32737,7 @@ QuaziliskBurrow: wait 1 playfram 0x1E0 sigorder 4 - goto QuaziliskLocal07 + goto ScourgeLocal00 QuaziliskUnBurrow: wait 1 @@ -34039,11 +33066,7 @@ ZoryusthalethWalking: ZoryusthalethSpecialState2: playfram 0x154 - goto ZoryusthalethLocal07 - -ZoryusthalethLocal07: - wait 125 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 ZoryusthalethBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -34066,7 +33089,7 @@ ZoryusthalethBurrow: playfram 0x154 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 ZoryusthalethUnBurrow: wait 1 @@ -34375,8 +33398,8 @@ AlmostBuilt LarvalCesiantAlmostBuilt Built LarvalCesiantBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -34384,7 +33407,7 @@ WarpIn [NONE] LarvalCesiantInit: imgul 1311 0 0 # Larval Cesiant Shadow (cm\zerg\larvalcolony-shad.grp) playfram 0x00 # Frame set 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 LarvalCesiantAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) @@ -34423,8 +33446,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 CaptaincySpecialState1 SpecialState2 [NONE] AlmostBuilt CaptaincyAlmostBuilt @@ -34444,19 +33467,19 @@ Burrow [NONE] CaptaincyInit: playfram 0x00 imgul 1313 0 0 # Captaincy shadow (cm\terran\captaincy-shad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 CaptaincySpecialState1: playfram 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CaptaincyAlmostBuilt: playfram 11 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CaptaincyBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 CaptaincyLanding: nobrkcodestart @@ -34473,7 +33496,7 @@ CaptaincyLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 CaptaincyLiftOff: nobrkcodestart @@ -34489,7 +33512,7 @@ CaptaincyLiftOff: # playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 CaptaincyIsWorking: playfram 1 @@ -34517,7 +33540,7 @@ CaptaincyIsWorking: goto CaptaincyIsWorking CaptaincyDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -34536,8 +33559,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 IronFoundrySpecialState1 SpecialState2 [NONE] AlmostBuilt IronFoundryAlmostBuilt @@ -34557,19 +33580,19 @@ Burrow [NONE] IronFoundryInit: playfram 0x00 imgul 1315 0 0 # Iron Foundry Shadow (cm\terran\ironfoundry-shad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 IronFoundrySpecialState1: playfram 4 - goto InfestedTerranLocal00 + goto ScourgeLocal00 IronFoundryAlmostBuilt: playfram 11 - goto InfestedTerranLocal00 + goto ScourgeLocal00 IronFoundryBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 IronFoundryLanding: nobrkcodestart @@ -34586,7 +33609,7 @@ IronFoundryLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 IronFoundryLiftOff: nobrkcodestart @@ -34602,7 +33625,7 @@ IronFoundryLiftOff: # playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 IronFoundryIsWorking: playfram 1 @@ -34630,7 +33653,7 @@ IronFoundryIsWorking: goto IronFoundryIsWorking IronFoundryDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -34639,7 +33662,7 @@ IronFoundryDisable: IsId 556 Type 20 Init MineralFieldType1ChristmasInit -Death MineralFieldType1ChristmasDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -34651,49 +33674,21 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 MineralFieldType1ChristmasSpecialState1 -SpecialState2 MineralFieldType1ChristmasSpecialState2 -AlmostBuilt MineralFieldType1ChristmasAlmostBuilt -Built MineralFieldType1ChristmasBuilt -Landing MineralFieldType1ChristmasLanding +SpecialState1 MineralFieldType1SpecialState1 +SpecialState2 MineralFieldType1SpecialState2 +AlmostBuilt MineralFieldType1AlmostBuilt +Built InfestedTerranWalkingToIdle +Landing MineralFieldType1Landing LiftOff [NONE] IsWorking [NONE] -WorkingToIdle MineralFieldType1ChristmasBuilt +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # MineralFieldType1ChristmasInit: imgul 1317 0 0 # Mineral Field Type1 (Christmas) Shadow (cm\celebrations\christmas\mineralfield01-shad.grp) - goto MineralFieldType1ChristmasBuilt - -MineralFieldType1ChristmasBuilt: - playfram 0x00 - goto MineralFieldType1ChristmasLocal00 - -MineralFieldType1ChristmasLocal00: - wait 125 - goto MineralFieldType1ChristmasLocal00 - -MineralFieldType1ChristmasDeath: - wait 1 - end - -MineralFieldType1ChristmasSpecialState1: - playfram 3 - goto MineralFieldType1ChristmasLocal00 - -MineralFieldType1ChristmasSpecialState2: - playfram 2 - goto MineralFieldType1ChristmasLocal00 - -MineralFieldType1ChristmasAlmostBuilt: - playfram 1 - goto MineralFieldType1ChristmasLocal00 - -MineralFieldType1ChristmasLanding: - playfram 4 - goto MineralFieldType1ChristmasLocal00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -34702,7 +33697,7 @@ MineralFieldType1ChristmasLanding: IsId 557 Type 20 Init MineralFieldType2ChristmasInit -Death MineralFieldType2ChristmasDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -34714,49 +33709,21 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 MineralFieldType2ChristmasSpecialState1 -SpecialState2 MineralFieldType2ChristmasSpecialState2 -AlmostBuilt MineralFieldType2ChristmasAlmostBuilt -Built MineralFieldType2ChristmasBuilt -Landing MineralFieldType2ChristmasLanding +SpecialState1 MineralFieldType1SpecialState1 +SpecialState2 MineralFieldType1SpecialState2 +AlmostBuilt MineralFieldType1AlmostBuilt +Built InfestedTerranWalkingToIdle +Landing MineralFieldType1Landing LiftOff [NONE] IsWorking [NONE] -WorkingToIdle MineralFieldType2ChristmasBuilt +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # MineralFieldType2ChristmasInit: imgul 1319 0 0 # Mineral Field Type2 (Christmas) Shadow (cm\celebrations\christmas\mineralfield02-shad.grp) - goto MineralFieldType2ChristmasBuilt - -MineralFieldType2ChristmasBuilt: - playfram 0x00 - goto MineralFieldType2ChristmasLocal00 - -MineralFieldType2ChristmasLocal00: - wait 125 - goto MineralFieldType2ChristmasLocal00 - -MineralFieldType2ChristmasDeath: - wait 1 - end - -MineralFieldType2ChristmasSpecialState1: - playfram 3 - goto MineralFieldType2ChristmasLocal00 - -MineralFieldType2ChristmasSpecialState2: - playfram 2 - goto MineralFieldType2ChristmasLocal00 - -MineralFieldType2ChristmasAlmostBuilt: - playfram 1 - goto MineralFieldType2ChristmasLocal00 - -MineralFieldType2ChristmasLanding: - playfram 4 - goto MineralFieldType2ChristmasLocal00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -34765,7 +33732,7 @@ MineralFieldType2ChristmasLanding: IsId 558 Type 20 Init MineralFieldType3ChristmasInit -Death MineralFieldType3ChristmasDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -34777,47 +33744,21 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] -SpecialState1 MineralFieldType3ChristmasSpecialState1 -SpecialState2 MineralFieldType3ChristmasSpecialState2 -AlmostBuilt MineralFieldType3ChristmasAlmostBuilt -Built MineralFieldType3ChristmasBuilt -Landing MineralFieldType3ChristmasLanding +SpecialState1 MineralFieldType1SpecialState1 +SpecialState2 MineralFieldType1SpecialState2 +AlmostBuilt MineralFieldType1AlmostBuilt +Built InfestedTerranWalkingToIdle +Landing MineralFieldType1Landing LiftOff [NONE] IsWorking [NONE] -WorkingToIdle MineralFieldType3ChristmasBuilt +WorkingToIdle InfestedTerranWalkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # MineralFieldType3ChristmasInit: imgul 1321 0 0 # Mineral Field Type3 (Christmas) Shadow (cm\celebrations\christmas\mineralfield03-shad.grp) -MineralFieldType3ChristmasBuilt: - playfram 0x00 - goto MineralFieldType3ChristmasLocal00 - -MineralFieldType3ChristmasLocal00: - wait 125 - goto MineralFieldType3ChristmasLocal00 - -MineralFieldType3ChristmasDeath: - wait 1 - end - -MineralFieldType3ChristmasSpecialState1: - playfram 3 - goto MineralFieldType3ChristmasLocal00 - -MineralFieldType3ChristmasSpecialState2: - playfram 2 - goto MineralFieldType3ChristmasLocal00 - -MineralFieldType3ChristmasAlmostBuilt: - playfram 1 - goto MineralFieldType3ChristmasLocal00 - -MineralFieldType3ChristmasLanding: - playfram 4 - goto MineralFieldType3ChristmasLocal00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -34924,7 +33865,7 @@ VestryWorkingToIdle: IsId 560 Type 24 Init VestryConnectorInit -Death VestryConnectorDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -34940,14 +33881,14 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing VestryConnectorDeath +Landing Generic_Wait1End LiftOff VestryConnectorLiftOff IsWorking VestryConnectorIsWorking -WorkingToIdle InfestedTerranLocal00 +WorkingToIdle ScourgeLocal00 WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -34961,11 +33902,7 @@ VestryConnectorInit: wait 2 VestryConnectorIsWorking: playfram 3 - goto InfestedTerranLocal00 - -VestryConnectorDeath: - wait 1 - end + goto ScourgeLocal00 VestryConnectorLiftOff: playfram 2 @@ -35034,8 +33971,6 @@ ProtossWarpFadeInit: wait 1 playfram 24 wait 1 - goto ProtossWarpFadeDeath - ProtossWarpFadeDeath: wait 1 end @@ -35067,11 +34002,7 @@ HeraclesInit: imgul 1329 0 0 # Heracles shadow (cm\terran\heracles-shad.grp) HeraclesWalkingToIdle: playfram 0x00 - goto HeraclesLocal00 - -HeraclesLocal00: - wait 125 - goto HeraclesLocal00 + goto ScourgeLocal00 HeraclesDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV @@ -35158,7 +34089,7 @@ HeraclesWalking: # 1330 Pazuzu (cm\terran\pazuzu.grp) .headerstart IsId 563 -Type 13 +Type 12 Init PazuzuInit Death PazuzuDeath GndAttkInit PazuzuGndAttkInit @@ -35232,10 +34163,6 @@ PazuzuWalking: wait 1 goto PazuzuWalking -PazuzuLocal00: - wait 125 - goto PazuzuLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1332 Deconstruction (small) (cm\effect\deconstruction.grp) @@ -35374,7 +34301,7 @@ Death [NONE] FullTilesetDoodadInit: playframtile 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # .headerstart @@ -35388,7 +34315,7 @@ Death [NONE] FullTilesetDoodadWithShadowInit: playframtile 0x00 imgulnextid 0 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -35397,18 +34324,14 @@ FullTilesetDoodadWithShadowInit: IsId 567 Type 1 Init FullTilesetDoodadFlipInit -Death FullTilesetDoodadFlipDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # FullTilesetDoodadFlipInit: playframtile 0x00 setflipstate 1 - goto InfestedTerranLocal00 - -FullTilesetDoodadFlipDeath: - wait 1 - end + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -35568,11 +34491,7 @@ HierophantWalking: HierophantWarpIn: imgol 125 0 0 # Dracadin Warp Flash (protoss\dragoon.grp) - goto HierophantLocal01 - -HierophantLocal01: - wait 125 - goto HierophantLocal01 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -35663,11 +34582,7 @@ ClarionGndAttkRpt: wait 1 nobrkcodeend gotorepeatattk - goto ClarionLocal00 - -ClarionLocal00: - wait 125 - goto ClarionLocal00 + goto ScourgeLocal00 ClarionWalking: playfram 0x00 @@ -35706,7 +34621,7 @@ ClarionWalking: ClarionWarpIn: imgol 133 0 0 # Didact Warp Flash (protoss\didact.grp) - goto ClarionLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -36172,11 +35087,7 @@ CohortAirAttkToIdle: CohortSpecialState2: playfram 0xee - goto CohortLocal05 - -CohortLocal05: - wait 125 - goto CohortLocal05 + goto ScourgeLocal00 CohortBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -36194,7 +35105,7 @@ CohortBurrow: sigorder 4 wait 1 playfram 0xee - goto CohortLocal05 + goto ScourgeLocal00 CohortUnBurrow: wait 1 @@ -36401,11 +35312,7 @@ AspirantWalking: AspirantWarpIn: imgol 125 0 0 # Aspirant Warp Flash (protoss\dragoon.grp) - goto AspirantLocal01 - -AspirantLocal01: - wait 125 - goto AspirantLocal01 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # Aspirant Criticality @@ -36627,7 +35534,7 @@ MagneticFieldDeath: # 1352 Akistrokor (cm\zerg\akistrokor.grp) .headerstart IsId 576 -Type 12 +Type 13 Init AkistrokorInit Death AkistrokorDeath GndAttkInit AkistrokorGndAttkInit @@ -36962,11 +35869,7 @@ KonviliskWalking: KonviliskSpecialState2: playfram 282 - goto KonviliskLocal07 - -KonviliskLocal07: - wait 125 - goto KonviliskLocal07 + goto ScourgeLocal00 KonviliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -36989,7 +35892,7 @@ KonviliskBurrow: playfram 0x143 wait 1 sigorder 4 - goto KonviliskLocal07 + goto ScourgeLocal00 KonviliskUnBurrow: wait 1 @@ -37047,7 +35950,7 @@ LegionnaireTeleportDeath: # 1359 Claymore (cm\terran\claymore.grp) .headerstart IsId 579 -Type 13 +Type 12 Init ClaymoreInit Death ClaymoreDeath GndAttkInit ClaymoreGndAttkInit @@ -37059,7 +35962,7 @@ CastSpell [NONE] GndAttkToIdle ClaymoreGndAttkToIdle AirAttkToIdle ClaymoreGndAttkToIdle Unused2 [NONE] -Walking ClaymoreWalking +Walking ScourgeLocal00 WalkingToIdle ClaymoreGndAttkToIdle SpecialState1 [NONE] .headerend @@ -37105,10 +36008,6 @@ ClaymoreGndAttkInit: nobrkcodeend gotorepeatattk goto ClaymoreGndAttkToIdle - -ClaymoreWalking: - wait 125 - goto ClaymoreWalking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -37117,7 +36016,7 @@ ClaymoreWalking: IsId 580 Type 12 Init ClaymoreTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit ClaymoreTurretGndAttkInit AirAttkInit ClaymoreTurretGndAttkInit Unused1 [NONE] @@ -37136,7 +36035,7 @@ SpecialState1 [NONE] ClaymoreTurretInit: playfram 0x00 wait 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ClaymoreTurretGndAttkInit: playfram 0x33 @@ -37370,8 +36269,6 @@ WarpTextureFadeInit: warpoverlay 23 wait 1 warpoverlay 24 - goto WarpTextureFadeDeath - WarpTextureFadeDeath: wait 1 end @@ -37622,7 +36519,7 @@ GndAttkToIdle CharlatanGndAttkToIdle AirAttkToIdle CharlatanGndAttkToIdle Unused2 [NONE] Walking CharlatanWalking -WalkingToIdle CharlatanWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -37637,17 +36534,7 @@ WarpIn CharlatanWarpIn CharlatanInit: imgul 1172 0 0 # Charlatan Shadow (cm\protoss\charlatan-shad.grp) - playfram 0x00 # Frame set 0 - wait 2 - goto CharlatanLocal69 - -CharlatanLocal42: - playfram 0x00 - goto CharlatanLocal69 - -CharlatanLocal69: - wait 125 - goto CharlatanLocal69 + goto InfestedTerranWalkingToIdle CharlatanGndAttkToIdle: playfram 0xcc @@ -37660,7 +36547,7 @@ CharlatanGndAttkToIdle: wait 1 playfram 0x00 wait 1 - goto CharlatanLocal69 + goto ScourgeLocal00 CharlatanDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV @@ -37701,7 +36588,7 @@ CharlatanUnused1: wait 2 setfldirect 12 nobrkcodeend - goto CharlatanLocal42 + goto InfestedTerranWalkingToIdle CharlatanGndAttkInit: playfram 0x99 @@ -37778,14 +36665,10 @@ CharlatanWalking: wait 1 playfram 0x77 goto CharlatanWalking - -CharlatanWalkingToIdle: - playfram 0x00 - goto CharlatanLocal69 CharlatanWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -38078,7 +36961,7 @@ IsId 594 Type 2 Init BurstLasersBlueSilentInit Death BurstLasersBlueSilentDeath -GndAttkInit BurstLasersBlueSilentGndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -38088,11 +36971,7 @@ BurstLasersBlueSilentInit: wait 1 sigorder 1 wait 1 - goto BurstLasersBlueSilentGndAttkInit - -BurstLasersBlueSilentGndAttkInit: - wait 125 - goto BurstLasersBlueSilentGndAttkInit + goto ScourgeLocal00 BurstLasersBlueSilentDeath: imgol 1249 0 0 # Burst Lasers Blue Hit Damaging (thingy\elbHit.grp) @@ -38106,7 +36985,7 @@ BurstLasersBlueSilentDeath: IsId 595 Type 13 Init VorvrokorBirthInit -Death VorvrokorBirthDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -38124,15 +37003,7 @@ SpecialState1 VorvrokorBirthSpecialState1 VorvrokorBirthInit: playfram 0x00 - goto VorvrokorBirthLocal00 - -VorvrokorBirthLocal00: - wait 125 - goto VorvrokorBirthLocal00 - -VorvrokorBirthDeath: - wait 1 - end + goto ScourgeLocal00 VorvrokorBirthSpecialState1: wait 1 @@ -38156,7 +37027,7 @@ VorvrokorBirthSpecialState1: sigorder 4 lowsprul 319 0 0 # Egg Spawn (zerg\zegspawn.grp) nobrkcodeend - goto VorvrokorBirthLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -38435,11 +37306,7 @@ LiiraliskWalking: LiiraliskSpecialState2: playfram 0x320 - goto LiiraliskLocal07 - -LiiraliskLocal07: - wait 125 - goto LiiraliskLocal07 + goto ScourgeLocal00 LiiraliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -38456,7 +37323,7 @@ LiiraliskBurrow: playfram 0x300 sigorder 4 playfram 0x320 - goto LiiraliskLocal07 + goto ScourgeLocal00 LiiraliskUnBurrow: wait 1 @@ -38653,7 +37520,7 @@ IsId 602 Type 13 Init BurstLasersBounceInit Death BurstLasersBounceDeath -GndAttkInit BurstLasersBounceGndAttkInit +GndAttkInit ScourgeLocal00 AirAttkInit [NONE] Unused1 [NONE] GndAttkRpt [NONE] @@ -38673,11 +37540,7 @@ BurstLasersBounceInit: wait 1 sigorder 1 wait 1 - goto BurstLasersBounceGndAttkInit - -BurstLasersBounceGndAttkInit: - wait 125 - goto BurstLasersBounceGndAttkInit + goto ScourgeLocal00 BurstLasersBounceDeath: imgol 447 0 0 # Burst Lasers Hit (thingy\elbHit.grp) @@ -38718,9 +37581,7 @@ OlympianInit: imgul 1399 0 2 # Olympian Shadow (cm\terran\olympian-shad.grp) OlympianWalkingToIdle: playfram 0x00 -OlympianLocal00: - wait 125 - goto OlympianLocal00 + goto ScourgeLocal00 OlympianDeath: playsndbtwn 276 277 # Terran\MARINE\TMaDth00.WAV | Terran\MARINE\TMaDth01.WAV @@ -38866,7 +37727,7 @@ OlympianWalking: # 1396 Autocrat (terran\autocrat.grp) .headerstart IsId 604 -Type 13 +Type 12 Init AutocratInit Death AutocratDeath GndAttkInit AutocratGndAttkInit @@ -39018,10 +37879,6 @@ AutocratWalking: wait 1 playfram 0x88 goto AutocratWalking - -AutocratLocal05: - wait 125 - goto AutocratLocal05 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -39047,13 +37904,13 @@ SpecialState2 [NONE] AlmostBuilt GuildhallAlmostBuilt Built GuildhallBuilt Landing GuildhallLanding -LiftOff GuildhallLiftOff +LiftOff ScourgeLocal00 IsWorking GuildhallIsWorking WorkingToIdle GuildhallWorkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable GuildhallDisable +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -39062,11 +37919,7 @@ GuildhallInit: imgul 1401 0 0 # Guildhall Shadow (cm\terran\medbay.grp) GuildhallBuilt: playfram 0x00 - goto GuildhallLocal00 - -GuildhallLocal00: - wait 125 - goto GuildhallLocal00 + goto ScourgeLocal00 GuildhallDeath: playsnd 7 # Misc\ExploLrg.wav @@ -39074,24 +37927,17 @@ GuildhallDeath: wait 3 liftoffcondjmp GuildhallLocal01 lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) - wait 1 - end - GuildhallLocal01: wait 1 end GuildhallAlmostBuilt: playfram 1 - goto GuildhallLocal00 + goto ScourgeLocal00 GuildhallLanding: # imgol 1326 0 0 # Guildhall connector (cm\terran\guildhall-connector.grp) - goto GuildhallLocal00 - -GuildhallLiftOff: - wait 125 - goto GuildhallLiftOff + goto ScourgeLocal00 GuildhallIsWorking: playfram 2 @@ -39133,15 +37979,12 @@ GuildhallWorkingToIdle: wait 1 goto GuildhallBuilt -GuildhallDisable: - goto GuildhallLiftOff - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1409 Striga (terran\striga.grp) .headerstart IsId 606 -Type 13 +Type 12 Init StrigaInit Death StrigaDeath GndAttkInit StrigaGndAttkInit @@ -39281,10 +38124,6 @@ StrigaWalking: wait 1 playfram 0x55 goto StrigaWalking - -StrigaLocal05: - wait 125 - goto StrigaLocal05 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -39356,10 +38195,6 @@ LuminaryGndAttkInit: ignorerest goto LuminaryGndAttkToIdle -LuminaryLocal00: - wait 125 - goto LuminaryLocal00 - LuminaryCastSpell: playfram 0x00 wait 1 @@ -39380,7 +38215,7 @@ LuminaryCastSpell: LuminaryWalking: setvertpos 0 - goto LuminaryLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -39396,8 +38231,8 @@ Unused1 AxitriliskUnused1 GndAttkRpt AxitriliskGndAttkInit AirAttkRpt AxitriliskGndAttkInit CastSpell [NONE] -GndAttkToIdle AxitriliskGndAttkToIdle -AirAttkToIdle AxitriliskGndAttkToIdle +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle ScourgeLocal00 Unused2 [NONE] Walking AxitriliskWalking WalkingToIdle AxitriliskWalkingToIdle @@ -39423,8 +38258,7 @@ AxitriliskInit: imgul 1414 0 -5 # Axitrilisk Shadow (cm\zerg\axitrilisk-shadow.grp) AxitriliskWalkingToIdle: playfram 0x00 - wait 125 - goto AxitriliskWalkingToIdle + goto ScourgeLocal00 AxitriliskDeath: playsnd 1536 # Skithrokor death 01 @@ -39455,7 +38289,7 @@ AxitriliskUnused1: wait 2 setfldirect 14 nobrkcodeend - goto AxitriliskWalkingToIdle + goto ScourgeLocal00 AxitriliskGndAttkInit: playfram 0x00 @@ -39484,9 +38318,6 @@ AxitriliskGndAttkInit: nobrkcodeend gotorepeatattk ignorerest -AxitriliskGndAttkToIdle: - playfram 0x00 - wait 1 goto AxitriliskWalkingToIdle AxitriliskWalking: @@ -39518,7 +38349,7 @@ AxitriliskWalking: AxitriliskSpecialState2: playfram 0x200 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 AxitriliskBurrow: setfldirect 14 @@ -39538,7 +38369,7 @@ AxitriliskBurrow: playfram 0x200 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 AxitriliskUnBurrow: wait 1 @@ -39558,7 +38389,7 @@ AxitriliskUnBurrow: playfram 0x20 wait 1 sigorder 4 - goto AxitriliskWalkingToIdle + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -39733,7 +38564,7 @@ AnthelionWarpIn: # 1416 Anticthon (cm\shared\anticthon.grp) .headerstart IsId 610 -Type 21 +Type 12 Init AnticthonInit Death AnticthonDeath GndAttkInit AnticthonGndAttkInit @@ -39748,14 +38579,6 @@ Unused2 [NONE] Walking AnticthonWalking WalkingToIdle AnticthonWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -39862,7 +38685,7 @@ SpecialState2 [NONE] AlmostBuilt TinkerersTowerAlmostBuilt Built TinkerersTowerBuilt Landing TinkerersTowerLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking TinkerersTowerIsWorking WorkingToIdle TinkerersTowerBuilt WarpIn [NONE] @@ -39876,19 +38699,19 @@ Burrow [NONE] TinkerersTowerInit: playfram 0x00 imgul 1421 0 0 # Tinkerer's Tower Shadow (cm\terran\tinkererstower-shadow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 TinkerersTowerAlmostBuilt: playfram 10 - goto InfestedTerranLocal00 + goto ScourgeLocal00 TinkerersTowerBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 TinkerersTowerLanding: #imgol 294 0 0 # Tinkerer's Tower Connector (terran\machineC.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 TinkerersTowerIsWorking: playfram 0x00 @@ -39914,7 +38737,7 @@ TinkerersTowerIsWorking: goto TinkerersTowerIsWorking TinkerersTowerDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -39940,7 +38763,7 @@ SpecialState2 [NONE] AlmostBuilt BioticBaseAlmostBuilt Built BioticBaseBuilt Landing BioticBaseLanding -LiftOff InfestedTerranLocal00 +LiftOff ScourgeLocal00 IsWorking BioticBaseIsWorking WorkingToIdle BioticBaseBuilt WarpIn [NONE] @@ -39954,19 +38777,19 @@ Burrow [NONE] BioticBaseInit: playfram 10 imgul 1423 0 0 # Biotic Base Shadow (cm\terran\bioticbase-shadow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 BioticBaseAlmostBuilt: playfram 10 - goto InfestedTerranLocal00 + goto ScourgeLocal00 BioticBaseBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 BioticBaseLanding: #imgol 294 0 0 # Biotic Base Connector (terran\machineC.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 BioticBaseIsWorking: playfram 0x00 @@ -39992,7 +38815,7 @@ BioticBaseIsWorking: goto BioticBaseIsWorking BioticBaseDisable: - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -40016,29 +38839,25 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built ProstrationStageBuilt -Landing ProstrationStageLanding -LiftOff ProstrationStageLanding +Built ScourgeLocal00 +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking ProstrationStageIsWorking -WorkingToIdle ProstrationStageBuilt +WorkingToIdle ScourgeLocal00 WarpIn ProstrationStageWarpIn Unused3 [NONE] StarEditInit [NONE] Disable ProstrationStageDisable Burrow [NONE] UnBurrow [NONE] -Enable ProstrationStageEnable +Enable InfestedTerranWalkingToIdle .headerend # ----------------------------------------------------------------------------- # ProstrationStageInit: playfram 0x00 imgul 1425 0 0 # Prostration Stage Shadow (cm\protoss\prostrationstage-shad.grp) - goto ProstrationStageLanding - -ProstrationStageLanding: - wait 125 - goto ProstrationStageLanding + goto ScourgeLocal00 ProstrationStageDeath: playsnd 7 # Misc\ExploLrg.wav @@ -40048,10 +38867,6 @@ ProstrationStageDeath: wait 1 end -ProstrationStageBuilt: - playfram 0x00 - goto ProstrationStageLanding - ProstrationStageIsWorking: playfram 1 wait 2 @@ -40095,26 +38910,21 @@ ProstrationStageIsWorking: ProstrationStageWarpIn: imgol 1426 0 0 # Prostration Stage Warp Flash (cm\protoss\prostrationstage.grp) - goto ProstrationStageLanding + goto ScourgeLocal00 ProstrationStageDisable: playfram 18 wait 2 playfram 19 wait 2 - goto ProstrationStageBuilt - -ProstrationStageEnable: - playfram 0x00 - wait 1 - goto ProstrationStageBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1427 Rogue Gallery (cm\protoss\roguegallery.grp) .headerstart IsId 614 -Type 20 +Type 21 Init RogueGalleryInit Death RogueGalleryDeath GndAttkInit [NONE] @@ -40131,11 +38941,11 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built RogueGalleryBuilt -Landing RogueGalleryLanding -LiftOff RogueGalleryLanding +Built InfestedTerranWalkingToIdle +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking RogueGalleryIsWorking -WorkingToIdle RogueGalleryBuilt +WorkingToIdle InfestedTerranWalkingToIdle WarpIn RogueGalleryWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -40143,11 +38953,7 @@ WarpIn RogueGalleryWarpIn RogueGalleryInit: playfram 0x00 imgul 1428 0 0 # Rogue Gallery Shadow (cm\protoss\roguegallery-shad.grp) - goto RogueGalleryLanding - -RogueGalleryLanding: - wait 125 - goto RogueGalleryLanding + goto ScourgeLocal00 RogueGalleryDeath: playsnd 7 # Misc\ExploLrg.wav @@ -40157,10 +38963,6 @@ RogueGalleryDeath: wait 1 end -RogueGalleryBuilt: - playfram 0x00 - goto RogueGalleryLanding - RogueGalleryIsWorking: playfram 1 wait 2 @@ -40188,14 +38990,14 @@ RogueGalleryIsWorking: RogueGalleryWarpIn: imgol 1429 0 0 # Rogue Gallery Warp Flash (cm\protoss\roguegallery.grp) - goto RogueGalleryLanding + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1433 Monument of Sin (cm\protoss\monumentofsin.grp) .headerstart IsId 616 -Type 20 +Type 21 Init MonumentOfSinInit Death MonumentOfSinDeath GndAttkInit [NONE] @@ -40212,11 +39014,11 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built MonumentOfSinBuilt -Landing MonumentOfSinLanding -LiftOff MonumentOfSinLanding +Built InfestedTerranWalkingToIdle +Landing ScourgeLocal00 +LiftOff ScourgeLocal00 IsWorking MonumentOfSinIsWorking -WorkingToIdle MonumentOfSinBuilt +WorkingToIdle InfestedTerranWalkingToIdle WarpIn MonumentOfSinWarpIn .headerend # ----------------------------------------------------------------------------- # @@ -40224,11 +39026,7 @@ WarpIn MonumentOfSinWarpIn MonumentOfSinInit: imgul 1434 0 0 # Monument of Sin Shadow (cm\protoss\monumentofsin-shad.grp) playfram 0x00 - goto MonumentOfSinLanding - -MonumentOfSinLanding: - wait 125 - goto MonumentOfSinLanding + goto ScourgeLocal00 MonumentOfSinDeath: playsnd 7 # Misc\ExploLrg.wav @@ -40272,14 +39070,10 @@ MonumentOfSinIsWorking: playfram 0 wait 1 goto MonumentOfSinIsWorking - -MonumentOfSinBuilt: - playfram 0x00 - goto MonumentOfSinLanding MonumentOfSinWarpIn: imgol 1435 0 0 # Monument of Sin Warp Flash (cm\protoss\monumentofsin.grp) - goto MonumentOfSinLanding + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -40316,8 +39110,6 @@ EmpressInit: imgul 1437 0 42 # Empress Shadow (cm\shared\empress.grp) EmpressGndAttkToIdle: playfram 0x00 - goto EmpressWalkingToIdle - EmpressWalkingToIdle: setvertpos 0 wait 8 @@ -40347,10 +39139,6 @@ EmpressGndAttkInit: gotorepeatattk goto EmpressGndAttkToIdle -EmpressLocal00: - wait 125 - goto EmpressLocal00 - EmpressAirAttkInit: wait 1 nobrkcodestart @@ -40364,11 +39152,11 @@ EmpressAirAttkInit: EmpressWalking: setvertpos 0 #imgol 1203 0 0 # Empress Engines (cm\shared\empress-engine.grp) - goto EmpressLocal00 + goto ScourgeLocal00 EmpressWarpIn: imgol 143 0 0 # Empress Warp Flash (shared\empress.grp) - goto EmpressLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -40417,7 +39205,7 @@ TarasqueSporesDeath: # 1439 Tarasque (terran\tank.grp) .headerstart IsId 619 -Type 23 +Type 12 Init TarasqueInit Death TarasqueDeath GndAttkInit TarasqueGndAttkInit @@ -40432,16 +39220,6 @@ Unused2 [NONE] Walking TarasqueWalking WalkingToIdle TarasqueWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -40452,7 +39230,7 @@ TarasqueInit: setfldirect 12 TarasqueWalkingToIdle: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 TarasqueDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV @@ -40502,7 +39280,7 @@ TarasqueWalking: # 1442 Explosion Blue (Small, Reversed) (thingy\tBangS.grp) .headerstart IsId 620 -Type 0 +Type 1 Init Explosion_SmallReversed_Init Death Explosion_SmallReversed_Death .headerend @@ -40537,7 +39315,7 @@ Explosion_SmallReversed_Death: # 1444 Explosion Blue (Medium, Reversed) (thingy\tBangL.grp) .headerstart IsId 621 -Type 0 +Type 1 Init Explosion_MediumReversed_Init Death Explosion_MediumReversed_Death .headerend @@ -40575,7 +39353,7 @@ Explosion_MediumReversed_Death: IsId 622 Type 1 Init ZealotDeathReversedInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -40606,21 +39384,21 @@ ZealotDeathReversedInit: IsId 623 Type 15 Init Engines_MultiGlowHeaderInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] -GndAttkRpt ScourgeExplosionDeath -AirAttkRpt ScourgeExplosionDeath -CastSpell ScourgeExplosionDeath -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +GndAttkRpt Generic_Wait1End +AirAttkRpt Generic_Wait1End +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking Engines_MultiGlowHeaderInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt ScourgeExplosionDeath +AlmostBuilt Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -40638,7 +39416,7 @@ Engines_MultiGlowHeaderInit: IsId 624 Type 1 Init NeutronFlareDamagelessInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -40753,7 +39531,7 @@ OvilethDeathReversedInit: IsId 627 Type 1 Init ZergAirDeathExplosionReversedInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -40786,7 +39564,7 @@ ZergAirDeathExplosionReversedInit: IsId 629 Type 24 Init IonCannonAttackAInit -Death IonCannonAttackADeath +Death Generic_Wait1End GndAttkInit IonCannonAttackAGndAttkInit AirAttkInit IonCannonAttackAGndAttkInit Unused1 [NONE] @@ -40821,10 +39599,6 @@ IonCannonAttackALocal00: wait 125 goto IonCannonAttackALocal00 -IonCannonAttackADeath: - wait 1 - end - IonCannonAttackAGndAttkInit: wait 3 IonCannonAttackAGndAttkRpt: @@ -41024,7 +39798,7 @@ ArcliteShockCannonHitDamagelessSilentDeath: # 1469 Magnetar (terran\magnetar.grp) .headerstart IsId 635 -Type 21 +Type 12 Init MagnetarInit Death MagnetarDeath GndAttkInit MagnetarGndAttkInit @@ -41037,16 +39811,8 @@ GndAttkToIdle MagnetarGndAttkToIdle AirAttkToIdle MagnetarGndAttkToIdle Unused2 [NONE] Walking MagnetarWalking -WalkingToIdle MinotaurGndAttkToIdle +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -41054,7 +39820,7 @@ MagnetarInit: imgul 1470 0 42 # Magnetar Shadow (cm\terran\magnetar.grp) MagnetarGndAttkToIdle: playfram 0x00 - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MagnetarDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav @@ -41071,7 +39837,7 @@ MagnetarUnused1: sprol 744 0 0 wait 12 nobrkcodeend - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MagnetarGndAttkInit: wait 1 @@ -41086,7 +39852,7 @@ MagnetarGndAttkInit: playfram 0x00 nobrkcodeend gotorepeatattk - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 MagnetarLocal00: wait 125 @@ -41337,11 +40103,7 @@ IzirokorWalking: IzirokorSpecialState2: playfram 0x187 - goto IzirokorLocal05 - -IzirokorLocal06: - wait 125 - goto IzirokorLocal06 + goto ScourgeLocal00 IzirokorBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -41365,7 +40127,7 @@ IzirokorBurrow: wait 1 sigorder 4 playfram 0x2fd - goto IzirokorLocal06 + goto ScourgeLocal00 IzirokorUnburrow: wait 1 @@ -41390,10 +40152,6 @@ IzirokorUnburrow: setfldirect 14 goto IzirokorGndAttkToIdle -IzirokorLocal05: - wait 125 - goto IzirokorLocal05 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1476 Izirokor Energy (cm\zerg\izirokor-projectile.grp) @@ -41510,7 +40268,6 @@ CuirassStonewallProtocolOverlayInit: playfram 19 wait 1 playfram 20 - wait 1 CuirassStonewallProtocolOverlayDeath: wait 1 end @@ -41704,9 +40461,9 @@ Death GasRawDeath GasRawInit: playfram 0 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 407 0 0 # Zerg Gas Sac Shadow (neutral\ngsShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 GasRawDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -41726,9 +40483,9 @@ Death GasRaw2Death GasRaw2Init: playfram 1 - pwrupcondjmp InfestedTerranLocal00 + pwrupcondjmp ScourgeLocal00 imgul 407 0 0 # Zerg Gas Sac Shadow (neutral\ngsShad.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 GasRaw2Death: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) @@ -42130,7 +40887,7 @@ TarasqueMuzzleFlashDeath: # 1648 Lanifect Remains (cm\protoss\lanifect-death.grp) .headerstart IsId 650 -Type 0 +Type 1 Init GenericRemnantsFiveInit Death GenericRemnantsFiveDeath .headerend @@ -42225,7 +40982,7 @@ GodsMadeFleshOverlayDeath: IsId 652 Type 1 Init PlagueFieldInit -Death PlagueFieldDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -42248,16 +41005,13 @@ PlagueFieldLocal00: playfram 7 wait 2 goto PlagueFieldLocal00 -PlagueFieldDeath: - wait 1 - end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1512 Gosvileth (cm\zerg\gosvileth.grp) .headerstart IsId 653 -Type 26 +Type 20 Init GosvilethInit Death GosvilethDeath GndAttkInit GosvilethGndAttkInit @@ -42280,12 +41034,6 @@ LiftOff GosvilethLiftOff IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -42493,7 +41241,7 @@ ArtisanAlmostBuilt: ArtisanWarpIn: imgol 139 0 0 # Artisan Warp Flash (protoss\probe.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -42502,7 +41250,7 @@ ArtisanWarpIn: IsId 655 Type 1 Init TyrannyStunInit -Death TyrannyStunDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -42543,20 +41291,15 @@ TyrannyStunLocal00: playfram 0 wait 2 goto TyrannyStunLocal00 -TyrannyStunDeath: - wait 1 - end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1524 Fusion Cutter Hit Damageless (bullet\scvspark.grp) .headerstart IsId 656 -Type 2 +Type 1 Init FusionCutterHitDamagelessInit Death FusionCutterHitDamagelessDeath -GndAttkInit [NONE] -AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -42595,7 +41338,7 @@ FusionCutterHitDamagelessDeath: IsId 657 Type 13 Init NewZergAirBirthInit -Death NewZergAirBirthDeath +Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -42613,11 +41356,7 @@ SpecialState1 NewZergZergAirBirthSpecialState1 NewZergAirBirthInit: playfram 0x00 - goto InfestedTerranLocal00 - -NewZergAirBirthDeath: - wait 1 - end + goto ScourgeLocal00 NewZergZergAirBirthSpecialState1: wait 1 @@ -42638,7 +41377,7 @@ NewZergZergAirBirthSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -42975,7 +41714,7 @@ KagraliskUnBurrow: # 1532 Kagralisk Remains .headerstart IsId 661 -Type 0 +Type 1 Init GenericRemnantsSixInit Death GenericRemnantsSixDeath .headerend @@ -43125,21 +41864,11 @@ IzkagItethIsWorking: # 1536 Kagralisk Venom .headerstart IsId 664 -Type 13 +Type 2 Init KagraliskVenomInit Death KagraliskVenomDeath GndAttkInit KagraliskVenomGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -43416,7 +42145,7 @@ EvigriliskWalking: EvigriliskSpecialState2: playfram 0x176 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 EvigriliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -43431,7 +42160,7 @@ EvigriliskBurrow: playfram 0x176 sigorder 4 wait 1 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 EvigriliskUnBurrow: wait 1 @@ -43456,14 +42185,14 @@ IsId 666 Type 20 Init Sentinel_Base_Init Death AtelierDeath -GndAttkInit InfestedTerranLocal00 -AirAttkInit InfestedTerranLocal00 +GndAttkInit ScourgeLocal00 +AirAttkInit ScourgeLocal00 Unused1 [NONE] -GndAttkRpt InfestedTerranLocal00 -AirAttkRpt InfestedTerranLocal00 +GndAttkRpt ScourgeLocal00 +AirAttkRpt ScourgeLocal00 CastSpell [NONE] -GndAttkToIdle InfestedTerranLocal00 -AirAttkToIdle InfestedTerranLocal00 +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle ScourgeLocal00 Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] @@ -43473,7 +42202,7 @@ AlmostBuilt Sentinel_Base_AlmostBuilt Built Sentinel_Base_Built Landing Sentinel_Base_Landing LiftOff Sentinel_Base_LiftOff -IsWorking InfestedTerranLocal00 +IsWorking ScourgeLocal00 WorkingToIdle Sentinel_Base_WorkingToIdle WarpIn [NONE] .headerend @@ -43482,11 +42211,11 @@ WarpIn [NONE] Sentinel_Base_Init: playfram 2 imgul 1546 0 0 # Sentinel (Base) Shadow - goto InfestedTerranLocal00 + goto ScourgeLocal00 Sentinel_Base_AlmostBuilt: playfram 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 Sentinel_Base_LiftOff: nobrkcodestart @@ -43502,7 +42231,7 @@ Sentinel_Base_LiftOff: # playfram 4 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 Sentinel_Base_Landing: nobrkcodestart @@ -43519,13 +42248,13 @@ Sentinel_Base_Landing: playfram 2 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 Sentinel_Base_Built: imgol 1545 0 0 # Sentinel (Turret) Sentinel_Base_WorkingToIdle: playfram 2 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -43534,7 +42263,7 @@ Sentinel_Base_WorkingToIdle: IsId 667 Type 24 Init Sentinel_Turret_Init -Death Sentinel_Turret_Death +Death Generic_Wait1End GndAttkInit Sentinel_Turret_GndAttkInit AirAttkInit Sentinel_Turret_GndAttkInit Unused1 [NONE] @@ -43548,7 +42277,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt InfestedTerranLocal00 +AlmostBuilt ScourgeLocal00 Built Sentinel_Turret_Built Landing Sentinel_Turret_Landing LiftOff Sentinel_Turret_LiftOff @@ -43557,7 +42286,7 @@ WorkingToIdle Sentinel_Turret_Built WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -43567,10 +42296,6 @@ Sentinel_Turret_Init: Sentinel_Turret_Built: wait 125 goto Sentinel_Turret_Built - -Sentinel_Turret_Death: - wait 1 - end Sentinel_Turret_LiftOff: nobrkcodestart @@ -43579,7 +42304,7 @@ Sentinel_Turret_LiftOff: wait 8 wait 8 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 Sentinel_Turret_Landing: nobrkcodestart @@ -43904,7 +42629,7 @@ WarpAnchorUnderlayInit: IsId 673 Type 1 Init BladeVortexDebuffInit -Death BladeVortexDebuffDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -43974,10 +42699,6 @@ BladeVortexDebuffLocal00: wait 1 goto BladeVortexDebuffLocal00 -BladeVortexDebuffDeath: - wait 1 - end - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1559 Stellar Enforcement Debuff (Small) @@ -44432,7 +43153,7 @@ SundogWalking: # 1523 Matador Tank Mode (cm\terran\matador.grp) .headerstart IsId 680 -Type 13 +Type 12 Init MatadorInit Death MatadorDeath GndAttkInit MatadorGndAttkInit @@ -44536,8 +43257,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 StarpadSpecialState1 SpecialState2 [NONE] AlmostBuilt StarpadAlmostBuilt @@ -44554,15 +43275,15 @@ StarpadInit: imgul 1055 0 0 # Starpad Shadow (cm\terran\starpad-shadow.grp) StarpadBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarpadSpecialState1: playfram 3 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarpadAlmostBuilt: playfram 5 - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarpadLanding: nobrkcodestart @@ -44579,7 +43300,7 @@ StarpadLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarpadLiftOff: nobrkcodestart @@ -44593,11 +43314,11 @@ StarpadLiftOff: playfram 3 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 StarpadIsWorking: imgol 1618 0 0 # Starpad Overlay (cm\terran\starpad-overlay.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -44674,7 +43395,7 @@ AncileWalking: # 1100 Hippogriff (cm\terran\hippogriff.grp) .headerstart IsId 683 -Type 21 +Type 12 Init HippogriffInit Death HippogriffDeath GndAttkInit HippogriffGndAttkInit @@ -44687,16 +43408,8 @@ GndAttkToIdle HippogriffGndAttkToIdle AirAttkToIdle HippogriffGndAttkToIdle Unused2 [NONE] Walking HippogriffWalking -WalkingToIdle MinotaurGndAttkToIdle +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -44704,7 +43417,7 @@ HippogriffInit: imgul 1101 0 42 # Hippogriff Shadow (cm\terran\hippogriff.grp) HippogriffGndAttkToIdle: playfram 0x00 - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 HippogriffDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav @@ -44732,7 +43445,7 @@ HippogriffGndAttkInit: playfram 0x00 nobrkcodeend gotorepeatattk - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 HippogriffAirAttkInit: wait 1 @@ -44757,7 +43470,7 @@ HippogriffAirAttkInit: wait 1 nobrkcodeend gotorepeatattk - goto MinotaurGndAttkToIdle + goto ScourgeLocal00 HippogriffLocal00: wait 125 @@ -45026,7 +43739,7 @@ ShamanSupportModeCastSpell: ShamanSupportModeWalking: setvertpos 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ShamanSupportModeSpecialState1: attackwith 1 @@ -45052,7 +43765,7 @@ GndAttkToIdle VagrantGndAttkToIdle AirAttkToIdle VagrantGndAttkToIdle Unused2 [NONE] Walking VagrantWalking -WalkingToIdle VagrantWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -45067,17 +43780,7 @@ WarpIn VagrantWarpIn VagrantInit: imgul 1277 0 -2 # Vagrant Shadow (cm\protoss\vagrant-shad.grp) - playfram 0x00 - wait 2 - goto VagrantLocal69 - -VagrantLocal42: - playfram 0x00 - goto VagrantLocal69 - -VagrantLocal69: - wait 125 - goto VagrantLocal69 + goto InfestedTerranWalkingToIdle VagrantGndAttkToIdle: playfram 0x180 @@ -45090,7 +43793,7 @@ VagrantGndAttkToIdle: wait 1 playfram 0x00 wait 1 - goto VagrantLocal69 + goto ScourgeLocal00 VagrantDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV @@ -45109,7 +43812,7 @@ VagrantUnused1: wait 12 setfldirect 12 nobrkcodeend - goto VagrantLocal42 + goto InfestedTerranWalkingToIdle VagrantGndAttkInit: playfram 0x120 @@ -45158,14 +43861,10 @@ VagrantWalking: wait 1 playfram 0xE0 goto VagrantWalking - -VagrantWalkingToIdle: - playfram 0x00 - goto VagrantLocal69 VagrantWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -45364,7 +44063,7 @@ HeraldWalkingToIdle: HeraldWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -45659,7 +44358,7 @@ TethzorokorWalkingToIdle: TethzorokorSpecialState2: playfram 0x4A0 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 TethzorokorBurrow: setfldirect 14 @@ -45679,7 +44378,7 @@ TethzorokorBurrow: playfram 0x4A0 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 TethzorokorUnBurrow: wait 1 @@ -45706,7 +44405,7 @@ TethzorokorUnBurrow: # 1341 Aion (cm\terran\aion.grp) .headerstart IsId 693 -Type 13 +Type 12 Init AionInit Death AionDeath GndAttkInit AionGndAttkInit @@ -45997,7 +44696,7 @@ ProtathalorWalkingToIdle: ProtathalorSpecialState2: playfram 0x340 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 ProtathalorBurrow: setfldirect 14 @@ -46017,7 +44716,7 @@ ProtathalorBurrow: playfram 0x340 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 ProtathalorUnBurrow: wait 1 @@ -46211,7 +44910,7 @@ VilgorokorWalkingToIdle: VilgorokorSpecialState2: playfram 0x198 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 VilgorokorBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -46234,7 +44933,7 @@ VilgorokorBurrow: playfram 0x198 wait 1 sigorder 4 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 VilgorokorUnBurrow: wait 1 @@ -46385,7 +45084,7 @@ CikraliskWalking: CikraliskSpecialState2: playfram 0x1A0 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 CikraliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) @@ -46402,7 +45101,7 @@ CikraliskBurrow: playfram 0x1A0 sigorder 4 wait 1 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 CikraliskUnBurrow: wait 1 @@ -46643,7 +45342,7 @@ GhitorokorWalking: # 1574 Zobriolisk (cm\zerg\zobriolisk.grp) .headerstart IsId 699 -Type 21 +Type 12 Init ZobrioliskInit Death ZobrioliskDeath GndAttkInit ZobrioliskGndAttkInit @@ -46658,14 +45357,6 @@ Unused2 [NONE] Walking ZobrioliskWalking WalkingToIdle ZobrioliskWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -47154,24 +45845,18 @@ Unused1 CataphractUnused1 GndAttkRpt CataphractGndAttkInit AirAttkRpt CataphractGndAttkInit CastSpell [NONE] -GndAttkToIdle CataphractGndAttkToIdle -AirAttkToIdle CataphractGndAttkToIdle +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking CataphractWalking -WalkingToIdle CataphractWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # CataphractInit: imgul 1167 0 0 # Cataphract shadow (cm\terran\cataphract-shadow.grp) -CataphractWalkingToIdle: - playfram 0x00 - goto CataphractLocal00 - -CataphractLocal00: - wait 125 - goto CataphractLocal00 + goto InfestedTerranWalkingToIdle CataphractDeath: playsndbtwn 3067 3073 # Cataphract death 01, 02, 03, 04, 05, 06, 07 @@ -47190,7 +45875,7 @@ CataphractUnused1: wait 12 setfldirect 13 nobrkcodeend - goto CataphractWalkingToIdle + goto InfestedTerranWalkingToIdle CataphractGndAttkInit: wait 1 @@ -47203,10 +45888,7 @@ CataphractGndAttkInit: nobrkcodeend gotorepeatattk ignorerest -CataphractGndAttkToIdle: - playfram 0x00 - wait 1 - goto CataphractWalkingToIdle + goto InfestedTerranWalkingToIdle CataphractWalking: playfram 0xA0 @@ -47274,20 +45956,14 @@ GndAttkToIdle DurendalGndAttkToIdle AirAttkToIdle DurendalGndAttkToIdle Unused2 [NONE] Walking DurendalWalking -WalkingToIdle DurendalWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # DurendalInit: imgul 1590 0 -9 # Durendal shadow (cm\terran\durendal-shadow.grp) -DurendalWalkingToIdle: - playfram 0x00 - goto DurendalLocal00 - -DurendalLocal00: - wait 125 - goto DurendalLocal00 + goto InfestedTerranWalkingToIdle DurendalDeath: playsndbtwn 1598 1602 # Durendal death 01, 02, 03, 04, 05 @@ -47305,7 +45981,7 @@ DurendalUnused1: wait 12 setfldirect 13 nobrkcodeend - goto DurendalWalkingToIdle + goto InfestedTerranWalkingToIdle DurendalGndAttkInit: playfram 0x220 @@ -47335,7 +46011,7 @@ DurendalGndAttkToIdle: wait 1 playfram 0x220 wait 1 - goto DurendalWalkingToIdle + goto InfestedTerranWalkingToIdle DurendalWalking: playfram 0xA0 @@ -48027,8 +46703,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 ApothecarySpecialState1 SpecialState2 [NONE] AlmostBuilt ApothecaryAlmostBuilt @@ -48045,15 +46721,15 @@ ApothecaryInit: imgul 1620 0 0 # Apothecary Shadow (cm\terran\apothecary-shadow.grp) ApothecaryBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ApothecarySpecialState1: playfram 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ApothecaryAlmostBuilt: playfram 5 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ApothecaryLanding: nobrkcodestart @@ -48070,7 +46746,7 @@ ApothecaryLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 ApothecaryLiftOff: nobrkcodestart @@ -48084,7 +46760,7 @@ ApothecaryLiftOff: # playfram 3 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 ApothecaryIsWorking: playfram 1 @@ -48257,24 +46933,18 @@ Unused1 RamessesUnused1 GndAttkRpt RamessesGndAttkInit AirAttkRpt RamessesGndAttkInit CastSpell [NONE] -GndAttkToIdle RamessesGndAttkToIdle -AirAttkToIdle RamessesGndAttkToIdle +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking RamessesWalking -WalkingToIdle RamessesWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # RamessesInit: imgul 1657 0 0 # Ramesses shadow (cm\terran\ramesses-shadow.grp) -RamessesWalkingToIdle: - playfram 0x00 - goto RamessesLocal00 - -RamessesLocal00: - wait 125 - goto RamessesLocal00 + goto InfestedTerranWalkingToIdle RamessesDeath: playsndbtwn 1598 1602 # Ramesses death 01, 02, 03, 04, 05 @@ -48293,7 +46963,7 @@ RamessesUnused1: wait 12 setfldirect 13 nobrkcodeend - goto RamessesWalkingToIdle + goto InfestedTerranWalkingToIdle RamessesGndAttkInit: wait 1 @@ -48307,10 +46977,7 @@ RamessesGndAttkInit: nobrkcodeend gotorepeatattk ignorerest -RamessesGndAttkToIdle: - playfram 0x00 - wait 1 - goto RamessesWalkingToIdle + goto InfestedTerranWalkingToIdle RamessesWalking: playfram 0x33 @@ -48356,8 +47023,8 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranLocal00 -WalkingToIdle InfestedTerranLocal00 +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 SpecialState1 MantleSpecialState1 SpecialState2 [NONE] AlmostBuilt MantleAlmostBuilt @@ -48374,15 +47041,15 @@ MantleInit: imgul 1655 0 0 # Mantle Shadow (cm\terran\mantle-shadow.grp) MantleBuilt: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 MantleSpecialState1: playfram 0 - goto InfestedTerranLocal00 + goto ScourgeLocal00 MantleAlmostBuilt: playfram 20 - goto InfestedTerranLocal00 + goto ScourgeLocal00 MantleLanding: nobrkcodestart @@ -48399,7 +47066,7 @@ MantleLanding: playfram 0x00 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 MantleLiftOff: nobrkcodestart @@ -48413,7 +47080,7 @@ MantleLiftOff: # playfram 3 sigorder 16 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 MantleIsWorking: playfram 1 @@ -48464,7 +47131,7 @@ MantleIsWorking: IsId 717 Type 1 Init DurendalWeaponfireInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -48479,7 +47146,7 @@ DurendalWeaponfireInit: wait 1 playfram 6 wait 1 - goto ScourgeExplosionDeath + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -48495,8 +47162,8 @@ Unused1 ServitorUnused1 GndAttkRpt ServitorGndAttkInit AirAttkRpt ServitorGndAttkInit CastSpell [NONE] -GndAttkToIdle ServitorGndAttkToIdle -AirAttkToIdle ServitorGndAttkToIdle +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking ServitorWalking WalkingToIdle ServitorWalkingToIdle @@ -48506,9 +47173,7 @@ SpecialState1 [NONE] ServitorInit: imgul 1661 0 7 # Servitor shadow (cm\protoss\servitor.grp) -ServitorGndAttkToIdle: - playfram 0x00 - goto ServitorWalkingToIdle + goto InfestedTerranWalkingToIdle ServitorWalkingToIdle: setvertpos 0 @@ -48521,10 +47186,6 @@ ServitorWalkingToIdle: wait 8 goto ServitorWalkingToIdle -ServitorLocal00: - wait 125 - goto ServitorLocal00 - ServitorDeath: playsnd 533 # Protoss\Aurora\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) @@ -48552,12 +47213,11 @@ ServitorGndAttkInit: playfram 0x00 wait 2 gotorepeatattk - goto ServitorGndAttkToIdle + goto InfestedTerranWalkingToIdle ServitorWalking: - playfram 0x00 setvertpos 0 - goto ServitorLocal00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -48573,8 +47233,8 @@ Unused1 PositronUnused1 GndAttkRpt PositronGndAttkInit AirAttkRpt PositronGndAttkInit CastSpell [NONE] -GndAttkToIdle PositronGndAttkToIdle -AirAttkToIdle PositronGndAttkToIdle +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking PositronWalking WalkingToIdle PositronWalkingToIdle @@ -48584,9 +47244,7 @@ SpecialState1 [NONE] PositronInit: imgul 1661 0 10 # Positron shadow (cm\protoss\positron.grp) -PositronGndAttkToIdle: - playfram 0x00 - goto PositronWalkingToIdle + goto InfestedTerranWalkingToIdle PositronWalkingToIdle: setvertpos 0 @@ -48599,10 +47257,6 @@ PositronWalkingToIdle: wait 8 goto PositronWalkingToIdle -PositronLocal00: - wait 125 - goto PositronLocal00 - PositronDeath: playsnd 566 # Protoss\ARBITER\PAbDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) @@ -48630,12 +47284,11 @@ PositronGndAttkInit: playfram 0x00 wait 2 gotorepeatattk - goto PositronGndAttkToIdle + goto InfestedTerranWalkingToIdle PositronWalking: - playfram 0x00 setvertpos 0 - goto PositronLocal00 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -48677,9 +47330,6 @@ AntiMatterMissileHitDamagingInit: playfram 12 wait 1 playfram 13 - wait 1 - end - AntiMatterMissileHitDamagingDeath: wait 1 end @@ -49128,9 +47778,6 @@ MadrigalDirgeProcInit: playfram 11 wait 1 playfram 12 - wait 1 - end - MadrigalDirgeProcDeath: wait 1 end @@ -49169,7 +47816,7 @@ WarpIn [NONE] SpirtithCesiantInit: imgul 1700 0 0 # Spirtith Cesiant Shadow (cm\zerg\spirtith-colony-shadow.grp) playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 SpirtithCesiantAirAttkInit: playfram 4 @@ -49550,7 +48197,7 @@ PatriarchWalkingToIdle: PatriarchWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -49561,21 +48208,21 @@ PatriarchWarpIn: IsId 730 Type 15 Init Engines_MultiGlowHeader_OmniInit -Death ScourgeExplosionDeath -GndAttkInit ScourgeExplosionDeath -AirAttkInit ScourgeExplosionDeath +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End Unused1 [NONE] -GndAttkRpt ScourgeExplosionDeath -AirAttkRpt ScourgeExplosionDeath -CastSpell ScourgeExplosionDeath -GndAttkToIdle ScourgeExplosionDeath -AirAttkToIdle ScourgeExplosionDeath +GndAttkRpt Generic_Wait1End +AirAttkRpt Generic_Wait1End +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End Unused2 [NONE] Walking Engines_MultiGlowHeader_OmniInit -WalkingToIdle ScourgeExplosionDeath +WalkingToIdle Generic_Wait1End SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt ScourgeExplosionDeath +AlmostBuilt Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -49771,28 +48418,18 @@ BactaliskAcidSpecialState1: playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03 sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg - goto Venom_Unused_GndAttkInit + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1725 Phalanx Mortar (cm\terran\phalanx-mortar.grp) .headerstart IsId 735 -Type 13 +Type 2 Init PhalanxMortarInit Death PhalanxMortarDeath GndAttkInit PhalanxMortarGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -49844,7 +48481,7 @@ AlmostBuilt WellboreAlmostBuilt Built WellboreBuilt Landing [NONE] LiftOff [NONE] -IsWorking InfestedTerranLocal00 +IsWorking ScourgeLocal00 WorkingToIdle WellboreBuilt WarpIn [NONE] .headerend @@ -49903,7 +48540,7 @@ WellboreLocal01: # 1726 Matador Cinder Mode (cm\terran\matador.grp) .headerstart IsId 737 -Type 23 +Type 14 Init MatadorCinderModeInit Death MatadorCinderModeDeath GndAttkInit MatadorCinderModeGndAttkInit @@ -49920,14 +48557,6 @@ WalkingToIdle [NONE] SpecialState1 MatadorCinderModeSpecialState2 SpecialState2 MatadorCinderModeSpecialState2 AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -50006,16 +48635,16 @@ MatadorCinderModeSpecialState2: playfram 0x00 wait 6 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1523 Matador Tank Mode Turret (cm\terran\matador-turret.grp) .headerstart IsId 738 -Type 13 +Type 12 Init MatadorTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit MatadorGndAttkInit AirAttkInit MatadorGndAttkInit Unused1 [NONE] @@ -50040,9 +48669,9 @@ MatadorTurretInit: # 1726 Matador Turret Cinder Mode (cm\terran\matador-turret.grp) .headerstart IsId 739 -Type 23 +Type 14 Init MatadorCinderModeTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit MatadorCinderModeGndAttkInit AirAttkInit MatadorCinderModeGndAttkInit Unused1 [NONE] @@ -50057,14 +48686,6 @@ WalkingToIdle [NONE] SpecialState1 MatadorCinderModeSpecialState2 SpecialState2 MatadorCinderModeSpecialState2 AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -50089,7 +48710,7 @@ MatadorCinderModeTurretInit: IsId 740 Type 12 Init WyvernTurretInit -Death ScourgeExplosionDeath +Death Generic_Wait1End GndAttkInit WyvernTurretGndAttkInit AirAttkInit WyvernTurretGndAttkInit Unused1 [NONE] @@ -50125,7 +48746,7 @@ WyvernTurretGndAttkInit: # 1731 Analogue (cm\protoss\analogue.grp) .headerstart IsId 741 -Type 21 +Type 12 Init AnalogueInit Death AnalogueDeath GndAttkInit AnalogueGndAttkInit @@ -50140,14 +48761,6 @@ Unused2 [NONE] Walking AnalogueWalking WalkingToIdle AnalogueGndAttkToIdle SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -50242,9 +48855,6 @@ ZergSporeExplosionLargeInit: playfram 8 wait 1 playfram 9 - wait 1 - end - ZergSporeExplosionLargeDeath: wait 1 end @@ -50464,7 +49074,7 @@ MortothrokorWalking: MortothrokorSpecialState2: playfram 0xAF - goto ZoryusthalethLocal07 + goto ScourgeLocal00 MortothrokorBurrow: setfldirect 14 @@ -50547,7 +49157,7 @@ PhantomStrikeProcDeath: # 1739 Shaman Visionary Mode (cm\terran\shaman.grp) .headerstart IsId 745 -Type 23 +Type 14 Init ShamanVisionaryModeInit Death ShamanVisionaryModeDeath GndAttkInit [NONE] @@ -50564,14 +49174,6 @@ WalkingToIdle [NONE] SpecialState1 ShamanVisionaryModeSpecialState2 SpecialState2 ShamanVisionaryModeSpecialState2 AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -50651,7 +49253,7 @@ ShamanVisionaryModeSpecialState2: playfram 0x00 wait 6 sigorder 1 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -50660,7 +49262,7 @@ ShamanVisionaryModeSpecialState2: IsId 746 Type 1 Init SpiderMineExplosionDeath -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -50668,7 +49270,7 @@ Death ScourgeExplosionDeath # 1714 Engram (cm\protoss\engram.grp) .headerstart IsId 752 -Type 27 +Type 21 Init EngramInit Death NexusDeath GndAttkInit EngramGndAttkInit @@ -50691,12 +49293,6 @@ LiftOff [NONE] IsWorking ScourgeLocal00 WorkingToIdle ScourgeLocal00 WarpIn EngramWarpIn -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -50764,12 +49360,12 @@ PhilocGndAttkInit: playfram 0x00 gotorepeatattk nobrkcodeend - goto WraithLocal00 + goto ScourgeLocal00 PhilocWalking: setvertpos 0 imgol 1747 0 0 # Philoc Engines (terran\wraith-engine.grp) - goto WraithLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -50842,7 +49438,7 @@ SpecialState1 ZergMutateSpecialState1 ZergMutateInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergMutateUnused: wait 1 @@ -50864,7 +49460,7 @@ ZergMutateUnused: sigorder 4 wait 2 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergMutateSpecialState1: playfram 0 @@ -50882,7 +49478,7 @@ ZergMutateSpecialState1: playfram 6 waitrand 1 3 sigorder 8 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -50891,7 +49487,7 @@ ZergMutateSpecialState1: IsId 755 Type 1 Init QuaziliskAttackOverlayInit -Death ScourgeExplosionDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -50961,7 +49557,7 @@ SpecialState1 ZergMutateAirSpecialState1 ZergMutateAirInit: playfram 0x00 - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergMutateAirUnused: wait 1 @@ -50981,7 +49577,7 @@ ZergMutateAirUnused: sigorder 4 wait 2 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 ZergMutateAirSpecialState1: playfram 0 @@ -50997,14 +49593,14 @@ ZergMutateAirSpecialState1: playfram 5 waitrand 1 3 sigorder 8 - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1756 Omnivale (cm\gamemodes\omnipresence\omnivale.grp) .headerstart IsId 758 -Type 27 +Type 21 Init OmnivaleInit Death NexusDeath GndAttkInit [NONE] @@ -51027,12 +49623,6 @@ LiftOff [NONE] IsWorking OmnivaleIsWorking WorkingToIdle OmnivaleWorkingToIdle WarpIn OmnivaleAlmostBuilt -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -51108,7 +49698,7 @@ GndAttkToIdle PotentateGndAttkToIdle AirAttkToIdle PotentateGndAttkToIdle Unused2 [NONE] Walking PotentateWalking -WalkingToIdle PotentateWalkingToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 PotentateMeleeAttkRpt SpecialState2 [NONE] AlmostBuilt [NONE] @@ -51123,17 +49713,7 @@ WarpIn PotentateWarpIn PotentateInit: imgul 1172 0 0 # Potentate Shadow (cm\protoss\potentate-shad.grp) - playfram 0x00 - wait 2 - goto PotentateLocal69 - -PotentateLocal42: - playfram 0x00 - goto PotentateLocal69 - -PotentateLocal69: - wait 125 - goto PotentateLocal69 + goto InfestedTerranWalkingToIdle PotentateGndAttkToIdle: playfram 0x180 @@ -51144,12 +49724,7 @@ PotentateGndAttkToIdle: wait 1 playfram 0x120 wait 1 - goto PotentateLocal511 - -PotentateLocal511: - playfram 0x00 - wait 1 - goto PotentateLocal69 + goto InfestedTerranWalkingToIdle PotentateDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV @@ -51168,7 +49743,7 @@ PotentateUnused1: wait 12 setfldirect 12 nobrkcodeend - goto PotentateLocal42 + goto InfestedTerranWalkingToIdle PotentateGndAttkInit: sigorder 32 @@ -51213,7 +49788,7 @@ PotentateMeleeAttkRpt: playfram 0x00 gotorepeatattk ignorerest - goto PotentateLocal511 + goto InfestedTerranWalkingToIdle PotentateWalking: move 5 @@ -51241,14 +49816,10 @@ PotentateWalking: wait 1 playfram 0xE0 goto PotentateWalking - -PotentateWalkingToIdle: - playfram 0x00 - goto PotentateLocal69 PotentateWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51284,7 +49855,7 @@ WarpIn [NONE] SkortrithCesiantInit: playfram 0x00 imgul 1704 0 0 # Skortrith Cesiant Shadow (cm\zerg\skortrith-cesiant-shadow.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 SkortrithCesiantGndAttkInit: trgtarccondjmp 74 42 SkortrithCesiantLocal00 @@ -51554,7 +50125,7 @@ HelixBoltDeath: # 1141 Hotshot (cm\faction\hotshot.grp) .headerstart IsId 764 -Type 13 +Type 12 Init HotshotInit Death MadcapDeath GndAttkInit HotshotGndAttkInit @@ -51630,7 +50201,7 @@ QilinInit: QilinWalking: setvertpos 0 imgol 1787 0 0 # Qilin Engines (cm\faction\qilin-engine.grp) - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51687,21 +50258,11 @@ AurielGndAttkRpt: # 1725 Spoke Shell (cm\terran\spoke-shell.grp) .headerstart IsId 767 -Type 13 +Type 2 Init SpokeShellInit Death SpokeShellDeath GndAttkInit SpokeShellGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -51853,7 +50414,7 @@ WorkingToIdle [NONE] WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable InfestedTerranLocal00 +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -51936,7 +50497,7 @@ AlgoztaliskWalking: # 1817 Cherbrathalor (cm\zerg\cherbrathalor.grp) .headerstart IsId 772 -Type 12 +Type 26 Init CherbrathalorInit Death KeskathalorDeath GndAttkInit CherbrathalorGndAttkInit @@ -51964,6 +50525,7 @@ StarEditInit [NONE] Disable [NONE] Burrow CherbrathalorBurrow UnBurrow CherbrathalorUnBurrow +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -52114,14 +50676,14 @@ CherbrathalorUnBurrow: CherbrathalorSpecialState2: playfram 0x280 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1815 Okrimnilisk (cm\zerg\okrimnilisk.grp) .headerstart IsId 773 -Type 12 +Type 26 Init OkrimniliskInit Death KeskathalorDeath GndAttkInit OkrimniliskGndAttkInit @@ -52149,6 +50711,7 @@ StarEditInit [NONE] Disable [NONE] Burrow OkrimniliskBurrow UnBurrow OkrimniliskUnBurrow +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -52288,7 +50851,7 @@ OkrimniliskUnBurrow: OkrimniliskSpecialState2: playfram 0x140 - goto ZoryusthalethLocal07 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52341,18 +50904,16 @@ KalkaliskBirthTempSpecialState1: wait 2 sigorder 4 nobrkcodeend - goto InfestedTerranLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1807 Addon Weld Overlay (bullet\scvspark.grp) .headerstart IsId 775 -Type 2 +Type 1 Init FusionCutterHitDamagelessSilentInit Death FusionCutterHitDamagelessDeath -GndAttkInit [NONE] -AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/cm/protoss/warpanchor-underlay.grp b/mpq/unit/cm/protoss/warpanchor-underlay.grp index 20188ed..a7c6e17 100644 Binary files a/mpq/unit/cm/protoss/warpanchor-underlay.grp and b/mpq/unit/cm/protoss/warpanchor-underlay.grp differ diff --git a/mpq/unit/cm/zerg/alkajelisk-birth-flying.grp b/mpq/unit/cm/zerg/alkajelisk-birth-flying.grp new file mode 100644 index 0000000..c5d9477 Binary files /dev/null and b/mpq/unit/cm/zerg/alkajelisk-birth-flying.grp differ diff --git a/mpq/unit/cm/zerg/zarcavrokor-birth-flying.grp b/mpq/unit/cm/zerg/zarcavrokor-birth-flying.grp new file mode 100644 index 0000000..bea4da1 Binary files /dev/null and b/mpq/unit/cm/zerg/zarcavrokor-birth-flying.grp differ diff --git a/mpq/unit/cm/zerg/zarcavrokor-birth.grp b/mpq/unit/cm/zerg/zarcavrokor-birth.grp new file mode 100644 index 0000000..bea4da1 Binary files /dev/null and b/mpq/unit/cm/zerg/zarcavrokor-birth.grp differ diff --git a/mpq/unit/protoss/pb1glow.grp b/mpq/unit/protoss/pb1glow.grp index f3212cf..ce53b45 100644 Binary files a/mpq/unit/protoss/pb1glow.grp and b/mpq/unit/protoss/pb1glow.grp differ diff --git a/patchnotes.md b/patchnotes.md index 3b346e6..ec811da 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,67 +1,26 @@ -# 6 April 2024 +# 13 April 2024 +## Acropolis #1 - Battlements Stage -This patch includes bugfixes, audiovisual improvements, and balance adjustments. +This patch includes bugfixes, audiovisual improvements and mild balance adjustments. Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zip) for easier setup and maintenance! We are still hunting for desyncs! Please submit your critical logs to cm-issues on [our Discord server](https://discord.com/invite/s5SKBmY). -## General -- **Internals:** - - Upgraded Discord support to include replay / witness status, game mode, and race (c. Veeq7) - - Cases where a unit's sprite is unexpectedly nonexistant will now print debug info to the screen -- **please screenshot this** and [submit it to us on discord!](https://discord.com/invite/s5SKBmY) - - Added "Prudence", a clone of the Artisan that can warp in structures, for use in UMS -- **Config:** - - Renamed 'config.yml' to 'cosmonarchy.yml' and migrated it to the user's Starcraft folder, centralizing configs for both prerelease and release (c. Veeq7) - - Added 'ingame' and 'witness' options for selection and minimap UI (c. Veeq7) - - Autosaved replays are now stored in a unique folder per date played (c. Veeq7) - - Added Furen advisor +## Bugfixes +- Gameplay: + - Fixed certain units being made invincible by Stasis Field, even after the effect expires (r. TheBeaver99 & benno) +- Audiovisuals: + - Fixed flipped SFX for Savant modes + - Fixed doubled SFX for Savant while in garrisons -## Bugfixes: -- **Stability:** - - Resolved a common desync case (with help from DF and Veeq7) - - **Caveat:** At least one other desync case still exists; please keep the reports coming! - - Protected against another nullsprite crash (r. Faktheking) -- **Gameplay:** - - Fixed an issue where unit turrets would be stunned even after certain stun effects wore off (r. TheBeaver99) - - Fixed tile walkability for Iceworld -> Higher Outpost -- **Audiovisuals:** - - Fixed repair animations not playing when repairing a unit suffering from HP drains (r. neblime) - - Fixed flipped weapon fire SFX for Savant modes (r. lolrsk8s) - - Fixed Kalkalisk birth animation playing the wrong frame sequence - - Discord activity now updates on first launch (c. Veeq7) - -## Audiovisuals -- Added reads for: - - Vilgoleth (corpse consumption proc) +## Audiovisuals: +- Overhauled cloaking visuals! (c. DF) - Added birth animations for: - - Iroleth (from egg), Tosgrilisk, Ghitorokor, Axitrilisk (WIP), Cherbrathalor, Okrimnilisk, Tetcaerokor -- Updated visuals for: - - Amaranth attack sequence - - Golem, Idol death animations -- Updated SFX for: - - Terran addon construction - - Golem death -- Added new SFX for: - - Ancile, Cataphract, Vassal, Idol, Empyrean death - - Amaranth, Exemplar weaponhit - -## Protoss -- [Ecclesiast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ecclesiast): - - Astral Blessing proc range now 3, from 2 -- [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect): - - No longer attacks air targets -- [Matrix](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/matrix): - - Astral Tether proc range now 3, from 2 + - Alkajelisk (cocoon), Zarcavrokor (egg) ## Zerg -- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk): - - Armor penetration now 2, from 3 -- [Okrimnilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/okrimnilisk): - - Collision size now significantly larger - - Omnispores: - - Weapon damage now 1x4, from 1x8 -- [Surkith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/surkith-cesiant): - - Armor now 2, from 3 -- [Spraith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/spraith-cesiant): - - Armor now 3, from 2 \ No newline at end of file +- [Zethrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zethrokor): + - Time cost now 13, from 15 +- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): + - HP now 115, from 105 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index c1d2996..ed7d096 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ