diff --git a/CMBW-maps/test/!Cosmonarchy-test.scx b/CMBW-maps/test/!Cosmonarchy-test.scx index a712ec2a..e6da2762 100644 Binary files a/CMBW-maps/test/!Cosmonarchy-test.scx and b/CMBW-maps/test/!Cosmonarchy-test.scx differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index a8da08cf..21eaab9e 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 672c4b64..1ab2106d 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -11664,92 +11664,6 @@ PlasmaShellDeath: domissiledmg wait 1 end - -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 140 Scout (protoss\scout.grp) -.headerstart -IsId 161 -Type 21 -Init ScoutInit -Death ScoutDeath -GndAttkInit ScoutGndAttkInit -AirAttkInit ScoutAirAttkInit -Unused1 [NONE] -GndAttkRpt ScoutGndAttkInit -AirAttkRpt ScoutAirAttkInit -CastSpell [NONE] -GndAttkToIdle ScoutGndAttkToIdle -AirAttkToIdle ScoutGndAttkToIdle -Unused2 [NONE] -Walking ScoutWalking -WalkingToIdle ScoutWalkingToIdle -SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn ScoutWarpIn -.headerend -# ----------------------------------------------------------------------------- # - -ScoutInit: - imgul 141 0 42 # Scout Shadow (protoss\scout.grp) -ScoutGndAttkToIdle: - playfram 0x00 - goto ScoutWalkingToIdle - -ScoutWalkingToIdle: - setvertpos 0 - wait 8 - setvertpos 0 - wait 8 - setvertpos -1 - wait 8 - setvertpos 0 - wait 8 - goto ScoutWalkingToIdle - -ScoutDeath: - playsnd 533 # Protoss\Scout\PScDth00.WAV - imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 - end - -ScoutGndAttkInit: - playfram 0x11 - wait 1 - playsnd 80 # Bullet\HKMISSLE.wav - attackwith 2 - playfram 0x00 - gotorepeatattk - goto ScoutLocal00 - -ScoutLocal00: - wait 125 - goto ScoutLocal00 - -ScoutAirAttkInit: - playfram 0x11 - wait 1 - playsnd 80 # Bullet\HKMISSLE.wav - attackwith 2 - playfram 0x00 - gotorepeatattk - goto ScoutLocal00 - -ScoutWalking: - playfram 0x00 - setvertpos 0 - imgol 142 0 0 # Scout Engines (thingy\pscGlow.grp) - goto ScoutLocal00 - -ScoutWarpIn: - imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) - goto ScoutLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -24652,7 +24566,7 @@ MadrigalWalking: goto MadrigalLocal01 MadrigalLocal01: - wait 125 + wait 125 goto MadrigalLocal01 # ----------------------------------------------------------------------------- # @@ -24755,7 +24669,7 @@ PaladinGndAttkInit: gotorepeatattk ignorerest PaladinGndAttkToIdle: - wait 1 + wait 1 goto PaladinWalkingToIdle PaladinCastSpell: @@ -25020,45 +24934,45 @@ LiivralPondWorkingToIdle: LiivralPondDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) - wait 1 + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) + wait 1 end LiivralPondAlmostBuilt: - imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) - playfram 0x00 # Frame set 0 + imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) + playfram 0x00 goto LiivralPondBuilt LiivralPondBuilt: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 goto LiivralPondWorkingToIdle LiivralPondIsWorking: playfram 0x00 - wait 1 + wait 1 playfram 1 - wait 1 + wait 1 playfram 2 - wait 1 + wait 1 playfram 3 - wait 1 + wait 1 playfram 4 - wait 1 + wait 1 playfram 5 - waitrand 1 2 + waitrand 1 2 playfram 4 - wait 1 + wait 1 playfram 3 - wait 1 + wait 1 playfram 2 - wait 1 + wait 1 playfram 1 wait 1 playfram 0x00 - waitrand 1 3 + waitrand 1 3 goto LiivralPondIsWorking # ----------------------------------------------------------------------------- # @@ -25161,115 +25075,6 @@ OthstolOviformIsWorking: playfram 10 wait 1 goto OthstolOviformIsWorking - -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1046 Othstoleth Berth (cm\zerg\othstolethberth.grp) -.headerstart -IsId 433 -Type 20 -Init OthstolethBerthInit -Death OthstolethBerthDeath -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 OthstolethBerthAlmostBuilt -Built OthstolethBerthBuilt -Landing [NONE] -LiftOff [NONE] -IsWorking OthstolethBerthIsWorking -WorkingToIdle OthstolethBerthWorkingToIdle -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -OthstolethBerthInit: - imgul 1047 0 0 # Othstoleth Berth Shadow (cm\zerg\othstolethberth-shad.grp) - playfram 0x00 - goto OthstolethBerthWorkingToIdle - -OthstolethBerthWorkingToIdle: - playfram 0x00 - wait 2 - playfram 1 - wait 2 - playfram 2 - wait 2 - playfram 3 - wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 8 - wait 2 - playfram 9 - wait 2 - playfram 10 - wait 2 - playfram 11 - wait 2 - playfram 12 - wait 2 - goto OthstolethBerthWorkingToIdle - -OthstolethBerthDeath: - playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) - wait 1 - end - -OthstolethBerthAlmostBuilt: - imgol 107 0 0 # Zerg Building Spawn (Small) (zerg\zSpawn01.grp) -OthstolethBerthBuilt: - playfram 0x00 - wait 2 - goto OthstolethBerthWorkingToIdle - -OthstolethBerthIsWorking: - playfram 0x00 - wait 1 - playfram 1 - waitrand 1 2 - playfram 2 - wait 1 - playfram 3 - waitrand 1 2 - playfram 4 - wait 1 - playfram 5 - waitrand 1 2 - playfram 6 - wait 1 - playfram 7 - waitrand 1 2 - playfram 8 - wait 1 - playfram 9 - waitrand 1 2 - playfram 10 - wait 1 - playfram 11 - waitrand 1 2 - playfram 12 - wait 1 - goto OthstolethBerthIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -25318,7 +25123,7 @@ OthstolethLocal00: OthstolethDeath: playsnd 910 # Zerg\ovileth\ZOvDth00.WAV - imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) + imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) wait 1 lowsprul 186 0 42 # Zerg Building Rubble Small wait 1 @@ -25520,86 +25325,6 @@ IrolIrisIsWorking: wait 1 goto IrolIrisIsWorking -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1010 Drydock (cm\terran\drydock.grp) -.headerstart -IsId 437 -Type 20 -Init DrydockInit -Death DrydockDeath -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 DrydockAlmostBuilt -Built DrydockBuilt -Landing DrydockLanding -LiftOff DrydockLanding -IsWorking DrydockIsWorking -WorkingToIdle DrydockBuilt -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -DrydockInit: - playfram 0x00 # Frame set 0 - imgul 1055 0 0 # Drydock Shadow (cm\terran\drydock-shad.grp) - goto DrydockLanding - -DrydockLanding: - wait 125 - goto DrydockLanding - -DrydockDeath: - playsnd 7 # Misc\ExploLrg.wav - imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) - wait 3 - liftoffcondjmp DrydockLocal00 - lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) - wait 1 - end - -DrydockLocal00: - wait 1 - end - -DrydockAlmostBuilt: - playfram 8 # Frame set 0, direction 11 - goto DrydockLanding - -DrydockBuilt: - playfram 0x00 # Frame set 0 - goto DrydockLanding - -DrydockIsWorking: - playfram 1 - wait 2 - playfram 2 - wait 2 - playfram 3 - wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 0x00 - wait 2 - goto DrydockIsWorking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1056 Treasury (cm\terran\treasury.grp) @@ -25737,187 +25462,6 @@ TreasuryIsWorking: waitrand 2 4 goto TreasuryIsWorking -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1058 Sire (cm\zerg\sire.grp) -.headerstart -IsId 439 -Type 20 -Init SireInit -Death SireDeath -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 SireAlmostBuilt -Built SireBuilt -Landing [NONE] -LiftOff [NONE] -IsWorking SireIsWorking -WorkingToIdle SireWorkingToIdle -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -SireInit: - imgul 1059 0 0 # Sire Shadow (cm\zerg\sire-shad.grp) - playfram 0x00 # Frame set 0 - goto SireWorkingToIdle - -SireWorkingToIdle: - playfram 1 - wait 2 - playfram 2 - wait 2 - playfram 3 - wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 8 - wait 2 - playfram 9 - wait 2 - playfram 10 - wait 2 - playfram 11 - wait 2 - playfram 12 - wait 2 - playfram 13 - wait 2 - playfram 14 - wait 2 - playfram 15 - wait 2 - playfram 16 - wait 2 - playfram 17 - wait 2 - playfram 18 - wait 2 - playfram 19 - wait 2 - playfram 20 - wait 2 - playfram 21 - waitrand 2 3 - playfram 0x00 - wait 2 - goto SireWorkingToIdle - -SireDeath: - playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) - wait 1 - end - -SireAlmostBuilt: - imgol 109 0 0 # Zerg Building Spawn (Large) (zerg\zSpawn03.grp) -SireBuilt: - playfram 0x00 # Frame set 0 - wait 2 - goto SireWorkingToIdle - -SireIsWorking: - playfram 21 - wait 2 - playfram 22 - wait 2 - playfram 23 - wait 2 - playfram 24 - wait 2 - playfram 25 - wait 2 - playfram 26 - wait 2 - playfram 27 - wait 2 - playfram 28 - wait 2 - playfram 29 - wait 2 - playfram 30 - wait 2 - playfram 31 - wait 2 - playfram 32 - wait 2 - playfram 33 - wait 2 - playfram 34 - wait 2 - playfram 35 - wait 2 - playfram 36 - wait 2 - playfram 37 - wait 2 - playfram 38 - wait 2 - playfram 39 - wait 2 - playfram 40 - wait 2 - playfram 41 - waitrand 3 5 - playfram 40 - wait 2 - playfram 39 - wait 2 - playfram 38 - wait 2 - playfram 37 - wait 2 - playfram 36 - wait 2 - playfram 35 - wait 2 - playfram 34 - wait 2 - playfram 33 - wait 2 - playfram 32 - wait 2 - playfram 31 - wait 2 - playfram 30 - wait 2 - playfram 29 - wait 2 - playfram 28 - wait 2 - playfram 27 - wait 2 - playfram 26 - wait 2 - playfram 25 - wait 2 - playfram 24 - wait 2 - playfram 23 - wait 2 - playfram 22 - wait 2 - goto SireIsWorking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1060 Treasury Overlay (cm\effect\treasury-overlay.grp) @@ -25930,7 +25474,7 @@ Death TreasuryEnhanceDeath # ----------------------------------------------------------------------------- # TreasuryEnhanceInit: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 TreasuryEnhanceLocal00: playfram 1 @@ -25968,7 +25512,7 @@ TreasuryEnhanceLocal00: goto TreasuryEnhanceDeath TreasuryEnhanceDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -38993,80 +38537,6 @@ KeskathalorAcidPoolDeath: wait 1 end -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1366 Alaszileth (cm\zerg\alaszileth.grp) -.headerstart -IsId 583 -Type 12 -Init AlaszilethInit -Death AlaszilethDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking AlaszilethWalking -WalkingToIdle AlaszilethWalkingToIdle -SpecialState1 [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -AlaszilethInit: - imgul 1367 0 42 # Alaszileth Shadow (cm\zerg\alaszileth.grp) - playfram 0x00 - wait 1 - goto AlaszilethLocal00 - -AlaszilethLocal00: - playfram 0x20 - wait 2 - playfram 0x40 - wait 2 - playfram 0x60 - wait 2 - playfram 0x80 - wait 2 - playfram 0xA0 - wait 2 - playfram 0xC0 - wait 2 - playfram 0x00 - wait 2 - goto AlaszilethLocal00 - -AlaszilethDeath: - playsnd 910 # Zerg\ovileth\ZOvDth00.WAV - imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) - wait 1 - end - -AlaszilethWalking: - playfram 0x20 - wait 1 - playfram 0x40 - wait 1 - playfram 0x60 - wait 1 - playfram 0x80 - wait 1 - playfram 0xA0 - wait 1 - playfram 0xC0 - wait 1 - playfram 0x00 - wait 1 - goto AlaszilethWalking - -AlaszilethWalkingToIdle: - playfram 0x00 - wait 2 - goto AlaszilethLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1368 Warp Flash Fade (cm\protoss\texture-fade.grp)