diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index d0008e22..622eb4ad 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 777e86ff..29d7da85 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 6e7cf5ef..d459c133 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 25e23578..3789bf23 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1705,13 +1705,13 @@ Skortrith Colony Skortrith Colony Shadow Bunker Attack Overlay (Green) Bunker Attack Overlay (Blue) -Extended Image #705 -Extended Image #706 -Extended Image #707 -Extended Image #708 -Extended Image #709 -Extended Image #710 -Extended Image #711 +Terran Unit Rubble (Medium) +Terran Unit Rubble (Small) +Protoss Unit Rubble (Medium) +Protoss Unit Rubble (Small) +Zerg Unit Rubble (Medium) +Zerg Unit Rubble (Small) +Zerg Unit Rubble (Tiny) Extended Image #712 Extended Image #713 Extended Image #714 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index c717f22a..74697ee0 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl index 12b88778..1a868f02 100644 Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index 7eedcac5..3569b381 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -113,7 +113,7 @@ Vorvrokor Cyprian Shaman Kagg -Extended Portrait #6 +Ecclesiast Extended Portrait #7 Extended Portrait #8 Extended Portrait #9 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index a044e1ef..65c35cf9 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.tbl b/mpq/arr/sfxdata.tbl index 4313bfcf..e8acc19c 100644 Binary files a/mpq/arr/sfxdata.tbl and b/mpq/arr/sfxdata.tbl differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 24301f94..631cf27b 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2314,25 +2314,25 @@ Optecton Weaponfire 1 03 Optecton Weaponfire 1 04 Spider Mine Deploy 01 Terran Landing 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Matador Ready 01 +Matador Ready 02 +Matador Ready 03 +Matador Selected 01 +Matador Selected 02 +Matador Selected 03 +Matador Selected 04 +Matador Passive 01 +Matador Passive 02 +Matador Passive 03 +Matador Passive 04 +Matador Aggressive 01 +Matador Aggressive 02 +Matador Aggressive 03 +Matador Aggressive 04 +Matador Help 01 +Matador Help 02 +Matador Help 03 +Matador Help 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index cbd1b663..54caa45e 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 2c877dbe..af3e7f94 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -842,13 +842,13 @@ Spirtith Colony Skortrith Colony Bunker Attack Overlay (Green) Bunker Attack Overlay (Blue) -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Terran Unit Rubble (Medium) +Terran Unit Rubble (Small) +Protoss Unit Rubble (Medium) +Protoss Unit Rubble (Small) +Zerg Unit Rubble (Medium) +Zerg Unit Rubble (Small) +Zerg Unit Rubble (Tiny) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 4f92551f..c03b19bb 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 6bc4c5c1..487bdb78 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index 5a578160..91575bcf 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -62,7 +62,7 @@ Plague (Isthrathaleth ability) Consume (Zoryusthaleth ability) Particle Beam (Scribe) Particle Beam (Harvest) -Psi Blades (Zealot) +Phase Blades (Zealot) Pulse Blaster (Vassal) Phase Disruptor (Dracadin) Plasma Flurry (Gladius) @@ -84,7 +84,7 @@ Plasma Shell (Accantor) (deprecated) Stasis Field (Didact ability) Psi Storm (Cantavis ability) Hollowed Spores (Liiralisk) -Psi Sabers (Legionnaire) +Phase Spear (Legionnaire) Harrying Talons (Akistrokor) Discoid Railgun (Savant) Lobotomy Mine (unused) diff --git a/mpq/portrait/protoss/ecclesiast/fid00.smk b/mpq/portrait/protoss/ecclesiast/fid00.smk new file mode 100644 index 00000000..76a297ed Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/fid00.smk differ diff --git a/mpq/portrait/protoss/ecclesiast/fid01.smk b/mpq/portrait/protoss/ecclesiast/fid01.smk new file mode 100644 index 00000000..f7548878 Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/fid01.smk differ diff --git a/mpq/portrait/protoss/ecclesiast/fid02.smk b/mpq/portrait/protoss/ecclesiast/fid02.smk new file mode 100644 index 00000000..a1d3b350 Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/fid02.smk differ diff --git a/mpq/portrait/protoss/ecclesiast/fid03.smk b/mpq/portrait/protoss/ecclesiast/fid03.smk new file mode 100644 index 00000000..8ce6a699 Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/fid03.smk differ diff --git a/mpq/portrait/protoss/ecclesiast/tlk00.smk b/mpq/portrait/protoss/ecclesiast/tlk00.smk new file mode 100644 index 00000000..326d6a3b Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/tlk00.smk differ diff --git a/mpq/portrait/protoss/ecclesiast/tlk01.smk b/mpq/portrait/protoss/ecclesiast/tlk01.smk new file mode 100644 index 00000000..e20b3710 Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/tlk01.smk differ diff --git a/mpq/portrait/protoss/ecclesiast/tlk02.smk b/mpq/portrait/protoss/ecclesiast/tlk02.smk new file mode 100644 index 00000000..6955b127 Binary files /dev/null and b/mpq/portrait/protoss/ecclesiast/tlk02.smk differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 5d9451f2..d609537f 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index ddddbf41..91c4cae3 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -250,20 +250,20 @@ RilirokorRemnantsDeath: IsId 6 Type 26 Init InfestedTerranInit -Death InfestedTerranDeath +Death [NONE] GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 InfestedTerranUnused1 +Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking InfestedTerranWalking -WalkingToIdle InfestedTerranWalkingToIdle -SpecialState1 InfestedTerranSpecialState1 -SpecialState2 InfestedTerranSpecialState2 +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -274,15 +274,14 @@ WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] Disable [NONE] -Burrow InfestedTerranBurrow -UnBurrow InfestedTerranUnBurrow +Burrow [NONE] +UnBurrow [NONE] Enable [NONE] .headerend # ----------------------------------------------------------------------------- # InfestedTerranInit: imgul 9 0 0 # Infested Terran Shadow (zerg\zbgShad.grp) -InfestedTerranWalkingToIdle: playfram 0x00 goto InfestedTerranLocal00 @@ -290,126 +289,6 @@ InfestedTerranLocal00: wait 125 goto InfestedTerranLocal00 -InfestedTerranDeath: - playsnd 67 # Bullet\ZBGHit00.wav - setfldirect 0 - playfram 0xee - wait 1 - playfram 239 - wait 1 - playfram 240 - wait 1 - playfram 241 - wait 1 - playfram 242 - wait 1 - playfram 243 - wait 1 - playfram 244 - wait 1 - playfram 245 - wait 1 - lowsprul 236 0 0 # Maverick Remnants (terran\tmaDeath.grp) - wait 1 - end - -InfestedTerranUnused1: - wait 1 - nobrkcodestart - setfldirect 0 - playsnd 1182 - playfram 245 - wait 2 - playfram 244 - wait 2 - playfram 243 - wait 2 - playfram 242 - wait 2 - playfram 241 - wait 2 - playfram 240 - wait 2 - playfram 239 - wait 2 - playfram 0xee - wait 2 - setfldirect 12 - nobrkcodeend - goto InfestedTerranWalkingToIdle - -InfestedTerranWalking: - move 6 - wait 1 - playfram 0x11 - move 6 - wait 1 - playfram 0x22 - move 6 - wait 1 - playfram 0x33 - move 6 - wait 1 - playfram 0x44 - move 6 - wait 1 - playfram 0x55 - move 6 - wait 1 - playfram 0x66 - move 6 - wait 1 - playfram 0x77 - move 6 - wait 1 - playfram 0x00 - goto InfestedTerranWalking - -InfestedTerranSpecialState1: - attackwith 1 - sprol 136 0 0 # Infested Terran Explosion (thingy\zbgExplo.grp) - sigorder 1 - goto InfestedTerranLocal00 - -InfestedTerranSpecialState2: - playfram 0xdd - goto InfestedTerranLocal00 - -InfestedTerranBurrow: - imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0x88 - wait 1 - playfram 0x99 - wait 1 - playfram 0xaa - wait 1 - playfram 0xbb - wait 1 - playfram 0xcc - wait 1 - playfram 0xdd - wait 1 - sigorder 4 - goto InfestedTerranLocal00 - -InfestedTerranUnBurrow: - wait 1 - waitrand 1 4 - imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0xcc - wait 1 - playfram 0xbb - wait 1 - playfram 0xaa - wait 1 - playfram 0x99 - wait 1 - playfram 0x88 - wait 1 - playfram 0x00 - sigorder 4 - goto InfestedTerranLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 010 Infested Terran Explosion (thingy\zbgExplo.grp) @@ -1212,29 +1091,30 @@ SpecialState1 [NONE] GeszithalorInit: imgul 26 0 42 # Geszithalor Shadow (zerg\guardian.grp) - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 GeszithalorGndAttkToIdle: - playfram 0x00 # Frame set 0 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 0x22 # Frame set 2 - wait 2 - playfram 0x33 # Frame set 3 - wait 2 - playfram 0x44 # Frame set 4 - wait 2 - playfram 0x55 # Frame set 5 - wait 2 - playfram 0x66 # Frame set 6 - wait 2 + playfram 0x00 + wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 + playfram 0x44 + wait 2 + playfram 0x55 + wait 2 + playfram 0x66 + wait 2 goto GeszithalorGndAttkToIdle GeszithalorDeath: playsnd 852 # Zerg\Geszithalor\ZGuDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small end GeszithalorUnused1: @@ -1251,27 +1131,27 @@ GeszithalorUnused1: goto GeszithalorGndAttkToIdle GeszithalorGndAttkInit: - playsnd 71 # Bullet\ZGuFir00.wav - imgoluselo 518 0 0 # Geszithalor Attack Overlay (thingy\eplMuzz.grp) - attackwith 1 + playsnd 71 # Bullet\ZGuFir00.wav + imgoluselo 518 0 0 # Geszithalor Attack Overlay (thingy\eplMuzz.grp) + attackwith 1 gotorepeatattk goto GeszithalorGndAttkToIdle GeszithalorWalking: - playfram 0x00 # Frame set 0 - wait 1 - playfram 0x11 # Frame set 1 - wait 1 - playfram 0x22 # Frame set 2 - wait 1 - playfram 0x33 # Frame set 3 - wait 1 - playfram 0x44 # Frame set 4 - wait 1 - playfram 0x55 # Frame set 5 - wait 1 - playfram 0x66 # Frame set 6 - wait 1 + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 goto GeszithalorWalking # ----------------------------------------------------------------------------- # @@ -1969,7 +1849,8 @@ MutaliskGndAttkToIdle: MutaliskDeath: playsnd 942 # Zerg\Mutalid\ZMuDth00.WAV imgol 41 0 0 # Mutalisk Death (zerg\zmuDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end MutaliskUnused1: @@ -2065,7 +1946,8 @@ OvilethLocal00: OvilethDeath: playsnd 910 # Zerg\OVERLORD\ZOvDth00.WAV imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end OvilethUnused1: @@ -2132,14 +2014,14 @@ IsId 27 Type 12 Init MatralethInit Death MatralethDeath -GndAttkInit MatralethGndAttkInit -AirAttkInit MatralethGndAttkInit +GndAttkInit [NONE] +AirAttkInit [NONE] Unused1 MatralethUnused1 -GndAttkRpt MatralethGndAttkInit -AirAttkRpt MatralethGndAttkInit +GndAttkRpt [NONE] +AirAttkRpt [NONE] CastSpell MatralethCastSpell -GndAttkToIdle MatralethGndAttkToIdle -AirAttkToIdle MatralethGndAttkToIdle +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] Unused2 [NONE] Walking MatralethWalking WalkingToIdle MatralethGndAttkToIdle @@ -2149,25 +2031,26 @@ SpecialState1 [NONE] MatralethInit: imgul 47 0 42 # Matraleth Shadow (zerg\queen.grp) - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 MatralethGndAttkToIdle: - playfram 0x00 # Frame set 0 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 0x22 # Frame set 2 - wait 2 - playfram 0x33 # Frame set 3 - wait 2 - playfram 0x44 # Frame set 4 - wait 2 + playfram 0x00 + wait 2 + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 + playfram 0x44 + wait 2 goto MatralethGndAttkToIdle MatralethDeath: playsndbtwn 925 927 # Zerg\Queen\ZQuDth00.WAV | Zerg\Queen\ZQuDth02.WAV sprol 156 0 0 # Matraleth Death (zerg\zquDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end MatralethUnused1: @@ -2183,56 +2066,38 @@ MatralethUnused1: nobrkcodeend goto MatralethGndAttkToIdle -MatralethGndAttkInit: - setvertpos 0 - playfram 0x55 # Frame set 5 - wait 1 - playfram 0x66 # Frame set 6 - wait 1 - playfram 0x77 # Frame set 7 - wait 1 - playfram 0x88 # Frame set 8 - playsnd 90 # Bullet\ZQuFir00.wav - attackwith 1 - wait 1 - playfram 0x99 # Frame set 9 - wait 1 - playfram 0xaa # Frame set 10 - gotorepeatattk - goto MatralethGndAttkToIdle - MatralethCastSpell: setvertpos 0 - playfram 0x55 # Frame set 5 + playfram 0x55 nobrkcodestart - wait 1 - playfram 0x66 # Frame set 6 - wait 1 - playfram 0x77 # Frame set 7 + wait 1 + playfram 0x66 + wait 1 + playfram 0x77 playsnd 920 # Matraleth Spellcast 01 - wait 1 - playfram 0x88 # Frame set 8 + wait 1 + playfram 0x88 castspell - sigorder 2 - wait 1 - playfram 0x99 # Frame set 9 - wait 1 - playfram 0xaa # Frame set 10 + sigorder 2 + wait 1 + playfram 0x99 + wait 1 + playfram 0xaa nobrkcodeend gotorepeatattk goto MatralethGndAttkToIdle MatralethWalking: - playfram 0x00 # Frame set 0 - wait 1 - playfram 0x11 # Frame set 1 - wait 1 - playfram 0x22 # Frame set 2 - wait 1 - playfram 0x33 # Frame set 3 - wait 1 - playfram 0x44 # Frame set 4 - wait 1 + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 goto MatralethWalking # ----------------------------------------------------------------------------- # @@ -3137,10 +3002,15 @@ InfestedCommandCenterDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp SkrylingExplosionDeath + liftoffcondjmp LiftedTerranStructureDeath lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) wait 1 end + +LiftedTerranStructureDeath: + lowsprul 274 0 42 # Terran Building Rubble (Large) (thingy\RubbleL.grp) + wait 1 + end InfestedCommandCenterSpecialState1: playfram 4 @@ -3264,63 +3134,63 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # QuazrokPoolInit: - playfram 0x00 # Frame set 0 - imgul 65 0 0 # Quazrok Pool Shadow (zerg\zchShad.grp) + playfram 0x00 + imgul 65 0 0 # Quazrok Pool Shadow (zerg\zchShad.grp) goto QuazrokPoolWorkingToIdle QuazrokPoolWorkingToIdle: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 goto QuazrokPoolWorkingToIdle QuazrokPoolDeath: 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 QuazrokPoolAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) - playfram 0x00 # Frame set 0 + playfram 0x00 goto QuazrokPoolBuilt QuazrokPoolBuilt: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 goto QuazrokPoolWorkingToIdle QuazrokPoolIsWorking: - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 3 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 3 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 6 # Frame set 0, direction 6 - waitrand 2 3 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 3 # Frame set 0, direction 3 + playfram 4 + wait 2 + playfram 5 + wait 3 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 3 + playfram 5 + wait 2 + playfram 6 + waitrand 2 3 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 waitrand 2 4 goto QuazrokPoolIsWorking @@ -3370,35 +3240,35 @@ EvolutionChamberWorkingToIdle: goto EvolutionChamberWorkingToIdle EvolutionChamberDeath: - 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) + 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 EvolutionChamberAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) EvolutionChamberBuilt: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 goto EvolutionChamberWorkingToIdle EvolutionChamberIsWorking: - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 3 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 3 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 3 # Frame set 0, direction 3 - waitrand 2 3 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 3 + playfram 6 + wait 2 + playfram 5 + wait 3 + playfram 4 + wait 2 + playfram 3 + waitrand 2 3 goto EvolutionChamberIsWorking # ----------------------------------------------------------------------------- # @@ -5313,6 +5183,7 @@ MinotaurDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 273 0 42 # Terran Building Rubble Small end MinotaurGndAttkInit: @@ -5456,7 +5327,8 @@ TrojanInit: TrojanDeath: playsnd 210 # Terran\DROPSHIP\TDrDth00.wav imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end TrojanWalking: @@ -7124,7 +6996,8 @@ SeraphLocal00: SeraphBaseDeath: playsnd 348 # Terran\VESSEL\TVeDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end SeraphBaseCastSpell: @@ -7214,6 +7087,7 @@ PhalanxTankBaseDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 844 0 0 # Terran Unit Rubble Medium end PhalanxTankBaseUnused1: @@ -7343,6 +7217,7 @@ PhalanxSiegeBaseDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 844 0 0 # Terran Unit Rubble Medium end PhalanxSiegeBaseUnused1: @@ -7518,7 +7393,7 @@ FountainheadDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp SkrylingExplosionDeath + liftoffcondjmp LiftedTerranStructureDeath lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) wait 1 end @@ -7712,11 +7587,16 @@ AtelierDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp SkrylingExplosionDeath + liftoffcondjmp LiftedTerranStructureDeath_Small lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) wait 1 end +LiftedTerranStructureDeath_Small: + lowsprul 273 0 42 # Terran Building Rubble (Small) (thingy\RubbleS.grp) + wait 1 + end + AtelierAlmostBuilt: playfram 1 goto InfestedTerranLocal00 @@ -8004,15 +7884,11 @@ CommandCenterDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp CommandCenterLocal00 + liftoffcondjmp LiftedTerranStructureDeath lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) wait 1 end -CommandCenterLocal00: - wait 1 - end - CommandCenterSpecialState1: playfram 4 goto CommandCenterWalking @@ -8514,15 +8390,11 @@ FulcrumDeath: playsnd 7 imgol 334 0 0 # Explosion (Large) wait 3 - liftoffcondjmp FulcrumLocal00 + liftoffcondjmp LiftedTerranStructureDeath_Small lowsprul 273 0 0 # Terran Building Rubble (small) wait 1 end -FulcrumLocal00: - wait 1 - end - FulcrumSpecialState1: playfram 0x16 goto FulcrumWalking @@ -8848,41 +8720,6 @@ CovertOpsOverlayDeath: wait 1 end -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 292 Ion Cannon (neutral\ion.grp) -.headerstart -IsId 116 -Type 20 -Init IonCannonInit -Death AtelierDeath -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 IonCannonInit -Landing [NONE] -LiftOff [NONE] -IsWorking InfestedTerranLocal00 -WorkingToIdle InfestedTerranLocal00 -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -IonCannonInit: - playfram 0x00 - goto InfestedTerranLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 293 Machine Shop (terran\machines.grp) @@ -9313,32 +9150,32 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # PhysicsLabConnectorInit: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 PhysicsLabConnectorIsWorking: - playfram 4 # Frame set 0, direction 4 + playfram 4 goto InfestedTerranLocal00 PhysicsLabConnectorDeath: - wait 1 + wait 1 end PhysicsLabConnectorLiftOff: - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - wait 1 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 2 + wait 1 end # ----------------------------------------------------------------------------- # @@ -9573,11 +9410,11 @@ ReservoirLocal01: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 309 Science Facility (terran\research.grp) +# 309 Daedala (terran\research.grp) .headerstart IsId 126 Type 20 -Init ScienceFacilityInit +Init DaedalaInit Death CommandCenterDeath GndAttkInit [NONE] AirAttkInit [NONE] @@ -9590,33 +9427,33 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking InfestedTerranLocal00 WalkingToIdle InfestedTerranLocal00 -SpecialState1 ScienceFacilitySpecialState1 +SpecialState1 DaedalaSpecialState1 SpecialState2 [NONE] -AlmostBuilt ScienceFacilityAlmostBuilt -Built ScienceFacilityBuilt -Landing ScienceFacilityLanding -LiftOff ScienceFacilityLiftOff -IsWorking ScienceFacilityIsWorking -WorkingToIdle ScienceFacilityBuilt +AlmostBuilt DaedalaAlmostBuilt +Built DaedalaBuilt +Landing DaedalaLanding +LiftOff DaedalaLiftOff +IsWorking DaedalaIsWorking +WorkingToIdle DaedalaBuilt WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -ScienceFacilityInit: - imgul 311 0 0 # Science Facility Shadow (terran\trlShad.grp) -ScienceFacilityBuilt: +DaedalaInit: + imgul 311 0 0 # Daedala Shadow (terran\trlShad.grp) +DaedalaBuilt: playfram 0x00 goto InfestedTerranLocal00 -ScienceFacilitySpecialState1: +DaedalaSpecialState1: playfram 5 goto InfestedTerranLocal00 -ScienceFacilityAlmostBuilt: +DaedalaAlmostBuilt: playfram 1 goto InfestedTerranLocal00 -ScienceFacilityLanding: +DaedalaLanding: nobrkcodestart wait 18 playsnd 472 # Misc\Land.WAV @@ -9631,7 +9468,7 @@ ScienceFacilityLanding: nobrkcodeend goto InfestedTerranLocal00 -ScienceFacilityLiftOff: +DaedalaLiftOff: nobrkcodestart playsnd 471 # Misc\LiftOff.WAV playfram 2 @@ -9645,18 +9482,18 @@ ScienceFacilityLiftOff: nobrkcodeend goto InfestedTerranLocal00 -ScienceFacilityIsWorking: - imgol 310 0 0 # Science Facility Overlay (terran\ResearcT.grp) +DaedalaIsWorking: + imgol 310 0 0 # Daedala Overlay (terran\ResearcT.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 310 Science Facility Overlay (terran\ResearcT.grp) +# 310 Daedala Overlay (terran\ResearcT.grp) .headerstart IsId 127 Type 24 -Init ScienceFacilityOverlayInit -Death ScienceFacilityOverlayDeath +Init DaedalaOverlayInit +Death DaedalaOverlayDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -9666,34 +9503,34 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking ScienceFacilityOverlayDeath -WalkingToIdle ScienceFacilityOverlayDeath -SpecialState1 ScienceFacilityOverlayDeath +Walking DaedalaOverlayDeath +WalkingToIdle DaedalaOverlayDeath +SpecialState1 DaedalaOverlayDeath SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing ScienceFacilityOverlayDeath -LiftOff ScienceFacilityOverlayDeath -IsWorking ScienceFacilityOverlayIsWorking -WorkingToIdle ScienceFacilityOverlayDeath +Landing DaedalaOverlayDeath +LiftOff DaedalaOverlayDeath +IsWorking DaedalaOverlayIsWorking +WorkingToIdle DaedalaOverlayDeath WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable ScienceFacilityOverlayDeath +Disable DaedalaOverlayDeath Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -ScienceFacilityOverlayInit: +DaedalaOverlayInit: playfram 0x00 -ScienceFacilityOverlayIsWorking: +DaedalaOverlayIsWorking: tmprmgraphicend wait 5 tmprmgraphicstart wait 5 - goto ScienceFacilityOverlayIsWorking + goto DaedalaOverlayIsWorking -ScienceFacilityOverlayDeath: +DaedalaOverlayDeath: wait 1 end @@ -10142,11 +9979,11 @@ StarportOverlayDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 322 Engineering Bay (terran\weaponpl.grp) +# 322 Atlas (terran\weaponpl.grp) .headerstart IsId 136 Type 24 -Init EngineeringBayInit +Init AtlasInit Death CommandCenterDeath GndAttkInit [NONE] AirAttkInit [NONE] @@ -10159,42 +9996,42 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking InfestedTerranLocal00 WalkingToIdle InfestedTerranLocal00 -SpecialState1 EngineeringBaySpecialState1 +SpecialState1 AtlasSpecialState1 SpecialState2 [NONE] -AlmostBuilt EngineeringBayAlmostBuilt -Built EngineeringBayBuilt -Landing EngineeringBayLanding -LiftOff EngineeringBayLiftOff +AlmostBuilt AtlasAlmostBuilt +Built AtlasBuilt +Landing AtlasLanding +LiftOff AtlasLiftOff IsWorking InfestedTerranLocal00 -WorkingToIdle EngineeringBayWorkingToIdle +WorkingToIdle AtlasWorkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable EngineeringBayDisable +Disable AtlasDisable Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -EngineeringBayInit: +AtlasInit: playfram 0x00 - imgul 324 0 0 # Engineering Bay Shadow (terran\twpShad.grp) + imgul 324 0 0 # Atlas Shadow (terran\twpShad.grp) goto InfestedTerranLocal00 -EngineeringBaySpecialState1: +AtlasSpecialState1: playfram 4 goto InfestedTerranLocal00 -EngineeringBayAlmostBuilt: +AtlasAlmostBuilt: playfram 1 goto InfestedTerranLocal00 -EngineeringBayBuilt: - imgol 323 0 0 # Engineering Bay Overlay (terran\weaponpT.grp) -EngineeringBayWorkingToIdle: +AtlasBuilt: + imgol 323 0 0 # Atlas Overlay (terran\weaponpT.grp) +AtlasWorkingToIdle: playfram 0x00 goto InfestedTerranLocal00 -EngineeringBayLanding: +AtlasLanding: nobrkcodestart wait 25 playsnd 472 # Misc\Land.WAV @@ -10211,7 +10048,7 @@ EngineeringBayLanding: nobrkcodeend goto InfestedTerranLocal00 -EngineeringBayLiftOff: +AtlasLiftOff: nobrkcodestart playsnd 471 # Misc\LiftOff.WAV playfram 5 @@ -10225,17 +10062,17 @@ EngineeringBayLiftOff: nobrkcodeend goto InfestedTerranLocal00 -EngineeringBayDisable: +AtlasDisable: goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 323 Engineering Bay Overlay (terran\weaponpT.grp) +# 323 Atlas Overlay (terran\weaponpT.grp) .headerstart IsId 137 Type 24 -Init EngineeringBayOverlayInit -Death EngineeringBayOverlayDeath +Init AtlasOverlayInit +Death AtlasOverlayDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -10247,31 +10084,31 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking InfestedTerranLocal00 WalkingToIdle InfestedTerranLocal00 -SpecialState1 EngineeringBayOverlayDeath +SpecialState1 AtlasOverlayDeath SpecialState2 [NONE] AlmostBuilt [NONE] Built InfestedTerranLocal00 Landing InfestedTerranLocal00 LiftOff InfestedTerranLocal00 -IsWorking EngineeringBayOverlayIsWorking -WorkingToIdle EngineeringBayOverlayInit +IsWorking AtlasOverlayIsWorking +WorkingToIdle AtlasOverlayInit WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable EngineeringBayOverlayInit +Disable AtlasOverlayInit Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -EngineeringBayOverlayInit: +AtlasOverlayInit: playfram 0x00 goto InfestedTerranLocal00 -EngineeringBayOverlayDeath: +AtlasOverlayDeath: wait 1 end -EngineeringBayOverlayIsWorking: +AtlasOverlayIsWorking: playfram 0x00 wait 5 playfram 1 @@ -10284,7 +10121,7 @@ EngineeringBayOverlayIsWorking: wait 5 playfram 5 wait 5 - goto EngineeringBayOverlayIsWorking + goto AtlasOverlayIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -10544,6 +10381,13 @@ Explosion_Large_Init: # 217 Protoss Building Rubble (Large) (thingy\PRubbleL.grp) # 335 Terran Building Rubble (Small) (thingy\RubbleS.grp) # 336 Terran Building Rubble (Large) (thingy\RubbleL.grp) +# 1707 Terran Unit Rubble (Medium) (cm\terran\rubble-unit-medium.grp) +# 1708 Terran Unit Rubble (Small) (cm\terran\rubble-unit-small.grp) +# 1709 Protoss Unit Rubble (Medium) (cm\protoss\rubble-unit-medium.grp) +# 1710 Protoss Unit Rubble (Small) (cm\protoss\rubble-unit-small.grp) +# 1711 Zerg Unit Rubble (Medium) (cm\zerg\rubble-unit-medium.grp) +# 1712 Zerg Unit Rubble (Small) (cm\zerg\rubble-unit-small.grp) +# 1713 Zerg Unit Rubble (Tiny) (cm\zerg\rubble-unit-tiny.grp) .headerstart IsId 145 Type 1 @@ -10621,7 +10465,8 @@ DidactGndAttkToIdle: DidactDeath: playsnd 566 # Protoss\ARBITER\PAbDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end DidactGndAttkInit: @@ -10777,6 +10622,7 @@ ArchonEnergyDeath: playsnd 7 # Misc\ExploLrg.wav imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 846 0 0 # Protoss Unit Rubble Medium end ArchonEnergyUnused1: @@ -10996,14 +10842,15 @@ WarpIn SolarionWarpIn # ----------------------------------------------------------------------------- # SolarionInit: - imgulnextid 0 42 - playfram 0x00 # Frame set 0 + imgulnextid 0 42 + playfram 0x00 goto OvilethLocal00 SolarionDeath: playsndbtwn 595 596 # Protoss\Carrier\PCaDth00.WAV | Protoss\Carrier\PCaDth01.WAV imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 223 0 42 # Protoss Building Rubble Small end SolarionUnused1: @@ -11494,20 +11341,21 @@ WarpIn EnvoyWarpIn # ----------------------------------------------------------------------------- # EnvoyInit: - imgul 119 0 42 # Envoy Shadow (protoss\shuttle.grp) + imgul 119 0 42 # Envoy Shadow (protoss\shuttle.grp) EnvoyWalkingToIdle: - playfram 0x00 # Frame set 0 + playfram 0x00 goto OvilethLocal00 EnvoyDeath: playsnd 514 # Protoss\SHUTTLE\PShDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end EnvoyWalking: - playfram 0x00 # Frame set 0 - setvertpos 0 + playfram 0x00 + setvertpos 0 imgol 120 0 0 # Envoy Engines (thingy\pshGlow.grp) goto InfestedTerranLocal00 @@ -11584,6 +11432,7 @@ CantavisDeath: wait 2 playfram 295 wait 2 + lowsprul 847 0 0 # Protoss Unit Rubble Small end CantavisUnused1: @@ -11732,6 +11581,7 @@ AccantorDeath: playsnd 638 # Protoss\TRILOBYTE\PTrDth00.WAV imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 846 0 0 # Protoss Unit Rubble Medium end AccantorUnused1: @@ -12173,12 +12023,12 @@ ZealotDeathInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 148 Observer (protoss\witness.grp) +# 148 Witness (protoss\witness.grp) .headerstart IsId 165 Type 21 -Init ObserverInit -Death ObserverDeath +Init WitnessInit +Death WitnessDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -12188,7 +12038,7 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking ObserverWalking +Walking WitnessWalking WalkingToIdle OvilethLocal00 SpecialState1 [NONE] SpecialState2 [NONE] @@ -12198,28 +12048,29 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn ObserverWarpIn +WarpIn WitnessWarpIn .headerend # ----------------------------------------------------------------------------- # -ObserverInit: - imgul 149 0 42 # Observer Shadow (protoss\witness.grp) - playfram 0x00 # Frame set 0 +WitnessInit: + imgul 149 0 42 # Witness Shadow (protoss\witness.grp) + playfram 0x00 goto OvilethLocal00 -ObserverDeath: - playsndbtwn 651 652 # Protoss\Witness\PWiDth00.WAV | Protoss\Witness\PWiDth01.WAV - imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) - wait 3 +WitnessDeath: + playsndbtwn 651 652 # Protoss\Witness\PWiDth00.WAV | Protoss\Witness\PWiDth01.WAV + imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 847 0 42 # Protoss Unit Rubble Small end -ObserverWalking: - playfram 0x00 # Frame set 0 - setvertpos 0 +WitnessWalking: + playfram 0x00 + setvertpos 0 goto InfestedTerranLocal00 -ObserverWarpIn: - imgol 150 0 0 # Observer Warp Flash (protoss\witness.grp) +WitnessWarpIn: + imgol 150 0 0 # Witness Warp Flash (protoss\witness.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -13927,7 +13778,7 @@ WarpAnchorLocal01: # 139 Scribe Warp Flash (protoss\probe.grp) # 143 Scout Warp Flash (protoss\scout.grp) # 146 Accantor Warp Flash (protoss\trilob.grp) -# 150 Observer Warp Flash (protoss\witness.grp) +# 150 Witness Warp Flash (protoss\witness.grp) # 154 Zealot Warp Flash (protoss\zealot.grp) # 156 Templar Archives Warp Flash (protoss\archives.grp) # 159 Assimilator Warp Flash (protoss\assim.grp) @@ -21367,6 +21218,7 @@ VithriliskDeath: playsnd 1097 # Zerg\Vithrilisk\ZDvDth00.WAV sprol 483 0 0 # Vithrilisk Death (zerg\zdvDeath.grp) wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end VithriliskGndAttkInit: @@ -21721,6 +21573,7 @@ ValkyrieDeath: playsnd 1040 # Terran\FRIGATE\TVkDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end ValkyrieAirAttkInit: @@ -21843,7 +21696,8 @@ MindTyrantEnergyGndAttkInit: MindTyrantEnergyDeath: playsnd 7 # Misc\ExploLrg.wav imgol 928 0 0 # Mind Tyrant Death (protoss\PdaDeath.grp) - wait 3 + wait 3 + lowsprul 846 0 0 # Protoss Unit Rubble Medium end MindTyrantEnergyUnused1: @@ -22128,6 +21982,7 @@ LanifectDeath: playsnd 1351 # Lanifect death 01 imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 847 0 42 # Protoss Unit Rubble Small end LanifectAirAttkInit: @@ -22354,6 +22209,7 @@ CabalistDeath: playsnd 1920 # Cabalist death 01 imgol 153 0 0 # Zealot Death (protoss\zealot.grp) wait 1 + lowsprul 847 0 0 # Protoss Unit Rubble Small end CabalistUnused1: @@ -22640,7 +22496,8 @@ ExemplarDeath: wait 2 imgol 1563 6 -4 # Exemplar Death imgol 1563 -4 6 # Exemplar Death - wait 5 + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end ExemplarGndAttkInit: @@ -23171,44 +23028,44 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # MindControlHitInit: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 - playfram 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - wait 1 - playfram 10 # Frame set 0, direction 10 - wait 1 - playfram 11 # Frame set 0, direction 11 - wait 1 - playfram 12 # Frame set 0, direction 12 - wait 1 - playfram 13 # Frame set 0, direction 13 - wait 1 - playfram 14 # Frame set 0, direction 14 - wait 1 - playfram 15 # Frame set 0, direction 15 - wait 1 - playfram 16 # Frame set 0, direction 16 - wait 1 - playfram 0x11 # Frame set 1 - wait 1 - playfram 18 # Frame set 1, direction 1 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0x11 + wait 1 + playfram 18 + wait 1 goto SkrylingExplosionDeath # ----------------------------------------------------------------------------- # @@ -23259,47 +23116,47 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # FeedbackInit: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 - playfram 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - wait 1 - playfram 10 # Frame set 0, direction 10 - wait 1 - playfram 11 # Frame set 0, direction 11 - wait 1 - playfram 12 # Frame set 0, direction 12 - wait 1 - playfram 13 # Frame set 0, direction 13 - wait 1 - playfram 14 # Frame set 0, direction 14 - wait 1 - playfram 15 # Frame set 0, direction 15 - wait 1 - playfram 16 # Frame set 0, direction 16 - wait 1 - playfram 0x11 # Frame set 1 - wait 1 - playfram 18 # Frame set 1, direction 1 - wait 1 - playfram 19 # Frame set 1, direction 2 - wait 1 - playfram 20 # Frame set 1, direction 3 + playfram 0 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0x11 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 goto SkrylingExplosionDeath # ----------------------------------------------------------------------------- # @@ -23316,54 +23173,54 @@ Death SkrylingExplosionDeath # ----------------------------------------------------------------------------- # MaelstromOverlayInit: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 9 # Frame set 0, direction 9 - wait 2 - playfram 10 # Frame set 0, direction 10 - wait 2 - playfram 11 # Frame set 0, direction 11 - wait 2 - playfram 12 # Frame set 0, direction 12 - wait 2 - playfram 13 # Frame set 0, direction 13 - wait 2 - playfram 14 # Frame set 0, direction 14 - wait 2 - playfram 15 # Frame set 0, direction 15 - wait 2 - playfram 16 # Frame set 0, direction 16 - wait 2 - playfram 0x11 # Frame set 1 - wait 2 - playfram 18 # Frame set 1, direction 1 - wait 2 - playfram 19 # Frame set 1, direction 2 - wait 2 - playfram 20 # Frame set 1, direction 3 - wait 2 - playfram 21 # Frame set 1, direction 4 - wait 2 - playfram 22 # Frame set 1, direction 5 - wait 2 - playfram 23 # Frame set 1, direction 6 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + wait 2 + playfram 12 + wait 2 + playfram 13 + wait 2 + playfram 14 + wait 2 + playfram 15 + wait 2 + playfram 16 + wait 2 + playfram 0x11 + wait 2 + playfram 18 + wait 2 + playfram 19 + wait 2 + playfram 20 + wait 2 + playfram 21 + wait 2 + playfram 22 + wait 2 + playfram 23 + wait 2 goto MaelstromOverlayInit # ----------------------------------------------------------------------------- # @@ -23380,33 +23237,33 @@ Death Unknown394Death # ----------------------------------------------------------------------------- # Unknown394Init: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 1 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 1 tmprmgraphicstart - wait 48 + wait 48 tmprmgraphicend - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 1 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 1 Unknown394Death: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -23423,20 +23280,20 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # Unknown395Init: - wait 1 - sigorder 1 - wait 1 + wait 1 + sigorder 1 + wait 1 Unknown395GndAttkInit: - grdsprol 511 0 0 # Subterranean Spines (bullet\Spike.grp) + grdsprol 511 0 0 # Subterranean Spines (bullet\Spike.grp) dogrddamage - wait 2 + wait 2 goto Unknown395GndAttkInit Unknown395Death: - playsnd 1110 # Bullet\ZLrkHit1.wav + playsnd 1110 # Bullet\ZLrkHit1.wav imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) dogrddamage - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -23451,22 +23308,22 @@ Death [NONE] # ----------------------------------------------------------------------------- # DesertDoodad1Init: - playfram 0x00 # Frame set 0 + playfram 0x00 DesertDoodad1Local00: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 5 + wait 1 goto DesertDoodad1Local00 # ----------------------------------------------------------------------------- # @@ -23481,20 +23338,20 @@ Death [NONE] # ----------------------------------------------------------------------------- # DesertDoodad2Init: - playfram 0x00 # Frame set 0 + playfram 0x00 DesertDoodad2Local00: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 0x00 # Frame set 0 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 2 + wait 1 + playfram 1 + wait 1 + playfram 0x00 + wait 1 goto DesertDoodad2Local00 # ----------------------------------------------------------------------------- # @@ -23510,20 +23367,20 @@ Death [NONE] # ----------------------------------------------------------------------------- # DesertDoodad4Init: - playfram 0x00 # Frame set 0 + playfram 0x00 DesertDoodad4Local00: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 0x00 # Frame set 0 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 2 + wait 1 + playfram 1 + wait 1 + playfram 0x00 + wait 1 goto DesertDoodad4Local00 # ----------------------------------------------------------------------------- # @@ -23538,30 +23395,30 @@ Death [NONE] # ----------------------------------------------------------------------------- # DesertDoodadOverlayInit: - playfram 0x00 # Frame set 0 + playfram 0x00 DesertDoodadOverlayLocal00: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 - playfram 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - wait 1 - playfram 10 # Frame set 0, direction 10 - waitrand 63 75 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + waitrand 63 75 goto DesertDoodadOverlayLocal00 # ----------------------------------------------------------------------------- # @@ -23576,24 +23433,24 @@ Death [NONE] # ----------------------------------------------------------------------------- # DesertDoodad3Init: - playfram 0x00 # Frame set 0 + playfram 0x00 DesertDoodad3Local00: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 4 # Frame set 0, direction 4 - wait 2 - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 goto DesertDoodad3Local00 # ----------------------------------------------------------------------------- # @@ -23608,14 +23465,14 @@ Death [NONE] # ----------------------------------------------------------------------------- # TwilightDoodad4Init: - playfram 0x00 # Frame set 0 + playfram 0x00 TwilightDoodad4Local00: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 goto TwilightDoodad4Local00 # ----------------------------------------------------------------------------- # @@ -23630,20 +23487,20 @@ Death [NONE] # ----------------------------------------------------------------------------- # TwilightDoodad13Init: - playfram 0x00 # Frame set 0 + playfram 0x00 TwilightDoodad13Local00: - playfram 0x00 # Frame set 0 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 0x00 # Frame set 0 - wait 1 + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 2 + wait 1 + playfram 1 + wait 1 + playfram 0x00 + wait 1 goto TwilightDoodad13Local00 # ----------------------------------------------------------------------------- # @@ -23658,14 +23515,14 @@ Death [NONE] # ----------------------------------------------------------------------------- # TwilightDoodad5Init: - playfram 0x00 # Frame set 0 + playfram 0x00 TwilightDoodadLocal700: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 goto TwilightDoodadLocal700 # ----------------------------------------------------------------------------- # @@ -24176,7 +24033,8 @@ GorgrokorWalkingToIdle: GorgrokorDeath: playsnd 852 # Zerg\Guardian\ZGuDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 1 + wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small end GorgrokorGndAttkInit: @@ -24298,6 +24156,7 @@ IrolethDeath: playsnd 910 # Zerg\Ovileth\ZOvDth00.WAV imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end IrolethGndAttkInit: @@ -24400,7 +24259,7 @@ QuarryDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp SkrylingExplosionDeath + liftoffcondjmp LiftedTerranStructureDeath lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) wait 1 end @@ -24520,7 +24379,8 @@ AuroraWalkingToIdle: AuroraDeath: playsnd 533 # Protoss\Aurora\PScDth00.WAV imgol 1164 0 0 # Beta Protoss Explosion (small) (thingy\pexplode.grp) - wait 3 + wait 3 + lowsprul 847 0 42 # Protoss Unit Rubble Small end AuroraGndAttkInit: @@ -24602,6 +24462,7 @@ PanoptusDeath: playsnd 533 # Protoss\Panoptus\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end PanoptusGndAttkInit: @@ -24690,6 +24551,7 @@ CentaurDeath: wait 2 imgol 332 -5 -5 # Explosion2 (Small) (thingy\tBangS.grp) wait 5 + lowsprul 273 0 42 # Terran Building Rubble Small end CentaurUnused1: @@ -24782,6 +24644,7 @@ CuirassDeath: playsndbtwn 1247 1248 # Southpaw death 01, 02 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 844 0 0 # Terran Unit Rubble Medium end CuirassUnused1: @@ -24983,6 +24846,7 @@ MadrigalDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 1497 0 0 # Madrigal Death wait 3 + lowsprul 844 0 0 # Terran Unit Rubble Medium end MadrigalUnused1: @@ -25107,7 +24971,8 @@ PaladinLocal01: PaladinDeath: playsnd 985 # Terran\Duran\TDnPss05.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small end PaladinUnused1: @@ -25292,12 +25157,12 @@ PaladinWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1001 Salvo Yard (cm\terran\salvoyard.grp) +# 1001 Scrapyard (cm\terran\scrapyard.grp) .headerstart IsId 427 Type 24 -Init SalvoYardInit -Death SalvoYardDeath +Init ScrapyardInit +Death ScrapyardDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -25311,45 +25176,45 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt SalvoYardAlmostBuilt -Built SalvoYardBuilt -Landing SalvoYardLanding +AlmostBuilt ScrapyardAlmostBuilt +Built ScrapyardBuilt +Landing ScrapyardLanding LiftOff InfestedTerranLocal00 -IsWorking SalvoYardIsWorking -WorkingToIdle SalvoYardWorkingToIdle +IsWorking ScrapyardIsWorking +WorkingToIdle ScrapyardWorkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable SalvoYardDisable +Disable ScrapyardDisable Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -SalvoYardInit: - imgul 1037 0 0 # Salvo Yard Shadow (cm\terran\salvoyard-shad.grp) -SalvoYardBuilt: +ScrapyardInit: + imgul 1037 0 0 # Scrapyard Shadow (cm\terran\scrapyard-shad.grp) +ScrapyardBuilt: imgul 294 0 0 # Machine Shop Connector playfram 0x00 goto InfestedTerranLocal00 -SalvoYardAlmostBuilt: +ScrapyardAlmostBuilt: playfram 1 goto InfestedTerranLocal00 -SalvoYardLanding: +ScrapyardLanding: wait 125 goto InfestedTerranLocal00 -SalvoYardDeath: +ScrapyardDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp SkrylingExplosionDeath + liftoffcondjmp LiftedTerranStructureDeath lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) wait 1 end -SalvoYardIsWorking: +ScrapyardIsWorking: playfram 2 wait 2 playfram 3 @@ -25358,13 +25223,13 @@ SalvoYardIsWorking: wait 2 playfram 0x00 waitrand 2 5 - goto SalvoYardIsWorking + goto ScrapyardIsWorking -SalvoYardWorkingToIdle: +ScrapyardWorkingToIdle: playfram 0x00 - goto SalvoYardLanding + goto ScrapyardLanding -SalvoYardDisable: +ScrapyardDisable: goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -25720,6 +25585,7 @@ OthstolethDeath: playsnd 910 # Zerg\ovileth\ZOvDth00.WAV imgol 45 0 0 # Ovileth Death (zerg\zovDeath.grp) wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small end OthstolethWalking: @@ -26654,7 +26520,8 @@ SimulacrumLocal00: SimulacrumDeath: playsndbtwn 1256 1258 # Simulacrum death 01, 02, 03 imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 847 0 0 # Protoss Unit Rubble Small end SimulacrumGndAttkInit: @@ -26888,6 +26755,7 @@ PytheanDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 273 0 42 # Terran Building Rubble Small end PytheanWalking: @@ -27284,7 +27152,8 @@ NathrokorGndAttkToIdle: NathrokorDeath: playsnd 1203 # Nathrokor death 01 imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) - wait 1 + wait 1 + lowsprul 850 0 42 # Zerg Unit Rubble Tiny end NathrokorGndAttkInit: @@ -27394,7 +27263,8 @@ EmpyreanWalkingToIdle: EmpyreanDeath: playsnd 533 imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 223 0 42 # Protoss Building Rubble Small end EmpyreanGndAttkInit: @@ -27946,7 +27816,8 @@ AlkajeliskGndAttkToIdle: AlkajeliskDeath: playsnd 878 # Zerg\Ultra\ZUlDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 1 + wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small end AlkajeliskGndAttkInit: @@ -28082,9 +27953,9 @@ KeskathalorLocal03: KeskathalorDeath: playsnd 878 # Zerg\Ultra\ZUlDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 2 - lowsprul 158 0 0 # Ultrokor Remnants (zerg\zulDeath.grp) - wait 1 + wait 2 + lowsprul 186 0 0 # Zerg Building Rubble Small + wait 1 end KeskathalorGndAttkInit: @@ -28202,6 +28073,7 @@ StarSovereignDeath: wait 1 imgol 1566 0 0 # Protoss Explosion (Large) wait 3 + lowsprul 224 0 42 # Protoss Building Rubble Large end StarSovereignUnused1: @@ -28914,8 +28786,8 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # NaniteAssemblyInit: - playfram 0x00 # Frame set 0 - imgul 1126 0 0 # Nanite Assembly Shadow (cm\terran\naniteassembly-shad.grp) + playfram 0x00 + imgul 1126 0 0 # Nanite Assembly Shadow (cm\terran\naniteassembly-shad.grp) goto NaniteAssemblyWorkingToIdle NaniteAssemblyWorkingToIdle: @@ -28923,16 +28795,12 @@ NaniteAssemblyWorkingToIdle: goto NaniteAssemblyWorkingToIdle NaniteAssemblyDeath: - playsnd 7 # Misc\ExploLrg.wav + playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) - wait 3 - liftoffcondjmp NaniteAssemblyLocal00 + wait 3 + liftoffcondjmp LiftedTerranStructureDeath lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) - wait 1 - end - -NaniteAssemblyLocal00: - wait 1 + wait 1 end NaniteAssemblyAlmostBuilt: @@ -28940,12 +28808,12 @@ NaniteAssemblyAlmostBuilt: goto NaniteAssemblyWorkingToIdle NaniteAssemblyBuilt: - playfram 0x00 # Frame set 0 + playfram 0x00 goto NaniteAssemblyWorkingToIdle NaniteAssemblyLanding: nobrkcodestart - wait 15 + wait 15 playsnd 472 # Misc\Land.WAV # playfram 4 wait 8 @@ -28955,24 +28823,24 @@ NaniteAssemblyLanding: wait 8 # playfram 5 wait 8 - playfram 0x00 # Frame set 0 - sigorder 16 + playfram 0x00 + sigorder 16 nobrkcodeend goto InfestedTerranLocal00 NaniteAssemblyLiftOff: nobrkcodestart - playsnd 471 # Misc\LiftOff.WAV + playsnd 471 # Misc\LiftOff.WAV playfram 0x00 wait 1 -# playfram 5 # Frame set 0, direction 5 - wait 8 -# playfram 2 # Frame set 0, direction 2 - wait 8 -# playfram 3 # Frame set 0, direction 3 - wait 8 -# playfram 4 # Frame set 0, direction 4 - sigorder 16 +# playfram 5 + wait 8 +# playfram 2 + wait 8 +# playfram 3 + wait 8 +# playfram 4 + sigorder 16 nobrkcodeend goto InfestedTerranLocal00 @@ -29029,7 +28897,7 @@ NaniteAssemblyIsWorking: IsId 469 Type 24 Init ParticleAcceleratorInit -Death ParticleAcceleratorDeath +Death InfestedCommandCenterDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -29066,19 +28934,6 @@ ParticleAcceleratorLanding: # imgol 294 0 0 # Machine Shop Connector (terran\machineC.grp) goto InfestedTerranLocal00 -ParticleAcceleratorDeath: - playsnd 7 # Misc\ExploLrg.wav - imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) - wait 3 - liftoffcondjmp SkrylingExplosionDeath - lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) - wait 1 - end - -ParticleAcceleratorLocal00: - wait 1 - end - ParticleAcceleratorAlmostBuilt: playfram 5 goto InfestedTerranLocal00 @@ -29442,7 +29297,8 @@ GladiusWalkingToIdle: GladiusDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end GladiusGndAttkInit: @@ -29521,7 +29377,8 @@ MagisterWalkingToIdle: MagisterDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end MagisterGndAttkInit: @@ -29608,7 +29465,8 @@ VassalWalkingToIdle: VassalDeath: playsnd 8 # Misc\ExploMed.wav imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 847 0 42 # Protoss Unit Rubble Small end VassalGndAttkInit: @@ -29786,6 +29644,7 @@ SalamanderDeath: imgol 1553 -3 -7 # Salamander Death imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 8 + lowsprul 844 0 42 # Terran Unit Rubble Medium end SalamanderGndAttkInit: @@ -29908,7 +29767,8 @@ GorgonWalkingToIdle: GorgonDeath: playsndbtwn 1249 1251 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end GorgonGndAttkInit: @@ -29983,6 +29843,7 @@ PhobosDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 274 0 42 # Terran Building Rubble Large end PhobosGndAttkInit: @@ -30879,7 +30740,7 @@ AtreusDeath: imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 2 lowsprul 192 0 0 # Dracadin Remnants (protoss\pdrDeath.grp) - wait 1 + wait 1 end AtreusGndAttkInit: @@ -30994,30 +30855,31 @@ WarpIn AmaranthWarpIn AmaranthInit: imgul 1175 0 -3 # Amaranth Shadow (cm\protoss\amaranth-shad.grp) - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 AmaranthLocal69: wait 125 goto AmaranthLocal69 AmaranthGndAttkToIdle: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 goto AmaranthLocal69 AmaranthDeath: playsnd 741 # Protoss\DARKTEMPLAR\PDTDth00.WAV imgol 153 0 0 # Zealot Death (protoss\zealot.grp) - wait 1 + wait 1 + lowsprul 847 0 0 # Protoss Unit Rubble Small end AmaranthGndAttkInit: - playfram 0x11 # Frame set 6 - wait 1 - playfram 0x22 # Frame set 7 - wait 1 - playfram 0x33 # Frame set 8 - wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 goto AmaranthGndAttkRpt AmaranthGndAttkRpt: nobrkcodestart @@ -31041,12 +30903,12 @@ AmaranthGndAttkRpt: goto AmaranthGndAttkToIdle AmaranthCastSpell: - playfram 0x11 # Frame set 1 - wait 1 - playfram 0x22 # Frame set 2 - wait 1 - playfram 0x33 # Frame set 3 - wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 nobrkcodestart playfram 0x44 wait 1 @@ -31054,7 +30916,7 @@ AmaranthCastSpell: playsnd 111 castspell sigorder 2 - attackwith 1 + attackwith 1 wait 1 playfram 0x66 wait 1 @@ -31069,33 +30931,33 @@ AmaranthCastSpell: goto InfestedTerranLocal00 AmaranthWalking: - move 4 - wait 1 - playfram 0x99 # Frame set 9 - move 4 - wait 1 - playfram 0xaa # Frame set 10 - move 4 - wait 1 - playfram 0xbb # Frame set 11 - move 4 - wait 1 - playfram 0xcc # Frame set 12 - move 4 - wait 1 - playfram 0xdd # Frame set 13 - move 4 - wait 1 - playfram 0xee # Frame set 14 - move 4 - wait 1 - playfram 0xff # Frame set 15 - move 4 - wait 1 - playfram 0x110 # Frame set 16 + move 4 + wait 1 + playfram 0x99 + move 4 + wait 1 + playfram 0xaa + move 4 + wait 1 + playfram 0xbb + move 4 + wait 1 + playfram 0xcc + move 4 + wait 1 + playfram 0xdd + move 4 + wait 1 + playfram 0xee + move 4 + wait 1 + playfram 0xff + move 4 + wait 1 + playfram 0x110 move 5 wait 1 - playfram 0x121 # Frame set 17 + playfram 0x121 goto AmaranthWalking AmaranthWalkingToIdle: @@ -31103,7 +30965,7 @@ AmaranthWalkingToIdle: goto AmaranthLocal69 AmaranthWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -31557,7 +31419,8 @@ IdolLocal00: IdolDeath: playsnd 638 # Protoss\TRILOBYTE\PTrDth00.WAV imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 847 0 0 # Protoss Unit Rubble Small end IdolGndAttkInit: @@ -31650,7 +31513,8 @@ GolemLocal00: GolemDeath: playsnd 638 # Protoss\TRILOBYTE\PTrDth00.WAV imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 847 0 0 # Protoss Unit Rubble Small end GolemGndAttkInit: @@ -31759,6 +31623,7 @@ BarghestDeath: playsndbtwn 1239 1241 imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 847 0 42 # Protoss Unit Rubble Small end BarghestGndAttkInit: @@ -31964,7 +31829,8 @@ PariahDeath: imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) wait 2 imgol 153 0 0 # Zealot Death (protoss\zealot.grp) - wait 3 + wait 3 + lowsprul 846 0 0 # Protoss Unit Rubble Medium end PariahGndAttkInit: @@ -32138,7 +32004,8 @@ TalosLocal69: TalosDeath: playsndbtwn 1304 1307 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 845 0 42 # Terran Unit Rubble Small end TalosGndAttkInit: @@ -32769,6 +32636,7 @@ KalkaliskDeath: playsnd 942 # Zerg\Mutalid\ZMuDth00.WAV imgol 41 0 0 # Mutalisk Death (zerg\zmuDeath.grp) wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end KalkaliskGndAttkInit: @@ -33003,7 +32871,8 @@ ManifoldGndAttkToIdle: ManifoldDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 847 0 0 # Protoss Unit Rubble Small end ManifoldGndAttkInit: @@ -33118,6 +32987,7 @@ ArchitectDeath: playsnd 1334 # Architect death 01 imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 223 0 0 # Protoss Building Rubble Small end ArchitectGndAttkInit: @@ -34592,8 +34462,9 @@ IonCannonBaseIsWorking: IonCannonBaseDeath: playsnd 7 - imgol 334 0 0 + imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 + liftoffcondjmp LiftedTerranStructureDeath lowsprul 273 0 0 # Terran Building Rubble (small) wait 1 end @@ -35967,7 +35838,8 @@ AlmaksaliskGndAttkToIdle: AlmaksaliskDeath: playsnd 867 # Zerg\Hydra\ZHyDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end AlmaksaliskUnused1: @@ -37367,7 +37239,7 @@ SpecialState1 [NONE] HeraclesInit: imgul 1329 0 0 # Heracles shadow (cm\terran\heracles-shad.grp) HeraclesWalkingToIdle: - playfram 0x00 # Frame set 0 + playfram 0x00 goto HeraclesLocal00 HeraclesLocal00: @@ -37377,7 +37249,8 @@ HeraclesLocal00: HeraclesDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 844 0 0 # Terran Unit Rubble Medium end HeraclesUnused1: @@ -37493,7 +37366,8 @@ PazuzuGndAttkToIdle: PazuzuDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small end PazuzuUnused1: @@ -37936,7 +37810,8 @@ ClarionGndAttkToIdle: ClarionDeath: playsnd 7 # Misc\ExploLrg.wav imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 847 0 42 # Protoss Unit Rubble Small end ClarionGndAttkInit: @@ -38028,263 +37903,75 @@ WarpIn LegionnaireWarpIn LegionnaireInit: imgul 1339 0 0 # Legionnaire Shadow (cm\protoss\legionnaire-shad.grp) LegionnaireWalkingToIdle: - playfram 0x55 + playfram 0x00 LegionnaireLocal00: - wait 1 - waitrand 42 60 - randcondjmp 64 LegionnaireLocal01 - randcondjmp 85 LegionnaireLocal02 + wait 125 goto LegionnaireLocal00 -LegionnaireLocal01: - playfram 0x00 - wait 1 - playfram 0x22 -LegionnaireLocal03: - wait 1 - waitrand 14 21 - randcondjmp 85 LegionnaireLocal04 -LegionnaireLocal05: - turnccwise 1 - wait 1 - randcondjmp 225 LegionnaireLocal05 - goto LegionnaireLocal06 - -LegionnaireLocal06: - randcondjmp 160 LegionnaireLocal03 - wait 1 - waitrand 21 44 - playfram 0x00 - wait 1 - goto LegionnaireWalkingToIdle - -LegionnaireLocal04: - turncwise 1 - wait 1 - randcondjmp 236 LegionnaireLocal04 - randcondjmp 160 LegionnaireLocal03 - waitrand 22 45 - playfram 0x00 - wait 1 - goto LegionnaireWalkingToIdle - -LegionnaireLocal02: - playfram 0x00 -LegionnaireLocal07: - playfram 0x11 - wait 1 - playfram 0x33 - wait 1 - playfram 0x44 - wait 1 - playfram 0x00 - waitrand 1 4 - randcondjmp 115 LegionnaireLocal07 - randcondjmp 46 LegionnaireLocal08 -LegionnaireLocal09: - playfram 0x33 - wait 1 - playfram 0x22 - wait 1 - waitrand 1 4 - randcondjmp 115 LegionnaireLocal07 - randcondjmp 209 LegionnaireLocal09 - waitrand 15 45 - playfram 0x00 - wait 1 - goto LegionnaireWalkingToIdle - -LegionnaireLocal08: - wait 1 - waitrand 14 44 - playfram 0x00 - wait 1 - goto LegionnaireWalkingToIdle - LegionnaireDeath: playsnd 678 # Protoss\ZEALOT\PZeDth00.WAV - setfldirect 0 - playfram 221 - wait 2 - playfram 222 - wait 2 + imgol 153 0 0 # Zealot Death (protoss\zealot.grp) + wait 4 lowsprul 819 0 0 # Legionnaire Remains - playfram 223 - wait 2 - playfram 224 - wait 2 - playfram 225 - wait 2 - playfram 226 - wait 2 - playfram 227 - wait 2 + wait 3 end LegionnaireGndAttkInit: - playfram 0x00 wait 1 LegionnaireGndAttkRpt: - playsnd 1896 # Legionnaire weapon fire 01 - playfram 0x11 - wait 1 + playfram 0x100 nobrkcodestart - playfram 0x22 + playsnd 1896 # Legionnaire weapon fire 01 + playfram 0x120 wait 1 - playfram 0x33 - wait 1 - playfram 0x44 + playfram 0x140 attackmelee 1 1897 # Legionnaire weapon hit 01 wait 1 - playfram 0x33 + playfram 0x160 wait 1 - playfram 0x22 + playfram 0x140 attackmelee 1 1897 # Legionnaire weapon hit 01 wait 1 - playfram 0x11 + playfram 0x160 wait 1 - playfram 0x00 nobrkcodeend + playfram 0x120 + wait 1 gotorepeatattk ignorerest LegionnaireGndAttkToIdle: + playfram 0x100 + wait 1 goto LegionnaireWalkingToIdle LegionnaireWalking: move 4 wait 1 - playfram 0x55 + playfram 0x20 move 4 wait 1 - playfram 0x66 + playfram 0x40 move 4 wait 1 - playfram 0x77 + playfram 0x60 move 4 wait 1 - playfram 0x88 + playfram 0x80 move 4 wait 1 - playfram 0x99 + playfram 0xA0 move 4 wait 1 - playfram 0xaa + playfram 0xC0 move 4 wait 1 - playfram 0xbb - move 4 - wait 1 - playfram 0xcc + playfram 0xE0 goto LegionnaireWalking LegionnaireWarpIn: imgol 154 0 0 # Zealot Warp Flash (protoss\zealot.grp) goto LegionnaireLocal00 - -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1340 Scrapyard (cm\terran\scrapyard.grp) -.headerstart -IsId 571 -Type 20 -Init ScrapyardInit -Death ScrapyardDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking ScrapyardWalking -WalkingToIdle ScrapyardBuilt -SpecialState1 ScrapyardSpecialState1 -SpecialState2 [NONE] -AlmostBuilt ScrapyardAlmostBuilt -Built ScrapyardBuilt -Landing ScrapyardLanding -LiftOff ScrapyardLiftOff -IsWorking ScrapyardIsWorking -WorkingToIdle ScrapyardBuilt -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -ScrapyardInit: - imgul 1341 0 0 # Scrapyard Shadow (cm\terran\scrapyard-shad.grp) -ScrapyardBuilt: - playfram 0x00 - goto InfestedTerranLocal00 - -ScrapyardDeath: - playsnd 7 # Misc\ExploLrg.wav - imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) - wait 3 - liftoffcondjmp SkrylingExplosionDeath - lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) - wait 1 - end - -ScrapyardSpecialState1: - playfram 5 - goto InfestedTerranLocal00 - -ScrapyardWalking: - wait 125 - goto ScrapyardWalking - -ScrapyardLanding: - nobrkcodestart - wait 18 - playsnd 472 # Misc\Land.WAV - playfram 4 - wait 5 - playfram 3 - wait 5 - playfram 2 - wait 5 - playfram 0x00 - sigorder 16 - nobrkcodeend - goto ScrapyardBuilt - -ScrapyardAlmostBuilt: - playfram 1 - goto InfestedTerranLocal00 - -ScrapyardLiftOff: - nobrkcodestart - playsnd 471 # Misc\LiftOff.WAV - playfram 2 - wait 5 - playfram 3 - wait 5 - playfram 4 - wait 5 - playfram 5 - sigorder 16 - nobrkcodeend - goto InfestedTerranLocal00 - -ScrapyardIsWorking: - creategasoverlays 0 - waitrand 3 15 - creategasoverlays 2 - waitrand 3 15 - creategasoverlays 1 - waitrand 3 15 - creategasoverlays 2 - waitrand 3 15 - creategasoverlays 0 - waitrand 3 15 - creategasoverlays 1 - waitrand 3 15 - creategasoverlays 2 - waitrand 3 15 - goto ScrapyardIsWorking - + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1342 Blackjack (cm\terran\blackjack.grp) @@ -39152,7 +38839,8 @@ AkistrokorWalkingToIdle: AkistrokorDeath: playsndbtwn 925 927 # Zerg\Queen\ZQuDth00.WAV | Zerg\Queen\ZQuDth02.WAV sprol 156 0 0 # Matraleth Death (zerg\zquDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end AkistrokorGndAttkInit: @@ -39608,7 +39296,8 @@ ClaymoreGndAttkToIdle: ClaymoreDeath: playsnd 1307 # Claymore death 01 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small end ClaymoreGndAttkInit: @@ -40017,7 +39706,8 @@ DemiurgeDeath: imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) wait 2 imgol 153 0 0 # Zealot Death (protoss\zealot.grp) - wait 3 + wait 3 + lowsprul 223 0 0 # Protoss Building Rubble Small end DemiurgeGndAttkInit: @@ -40190,6 +39880,9 @@ SirenLocal02: SirenDeath: playsnd 353 # Terran\VULTURE\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 2 + lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + wait 1 wait 3 end @@ -40338,6 +40031,7 @@ CharlatanDeath: wait 2 playfram 244 wait 2 + lowsprul 847 0 0 # Protoss Unit Rubble Small end CharlatanUnused1: @@ -40863,7 +40557,8 @@ SkithrokorWalkingToIdle: SkithrokorDeath: playsnd 1536 # Skithrokor death 01 imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 1 + wait 1 + lowsprul 849 0 42 # Zerg Unit Rubble Small end SkithrokorUnused1: @@ -41099,10 +40794,10 @@ LiiraliskLocal00: LiiraliskDeath: playsnd 896 # Zerg\Zergling\ZZeDth00.WAV - imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) + imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) wait 5 - lowsprul 160 0 0 # Zergling Remnants (zerg\zzeDeath.grp) - wait 1 + lowsprul 849 0 0 # Zerg Unit Rubble Small + wait 1 end LiiraliskUnused1: @@ -41274,7 +40969,8 @@ SovrolethGndAttkToIdle: SovrolethDeath: playsnd 785 # Zerg\BROODLING\ZBrDth00.WAV imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) - wait 1 + wait 1 + lowsprul 850 0 42 # Zerg Unit Rubble Tiny end SovrolethCastSpell: @@ -41448,7 +41144,7 @@ Init OlympianInit Death OlympianDeath GndAttkInit OlympianGndAttkInit AirAttkInit OlympianGndAttkInit -Unused1 [NONE] +Unused1 OlympianRevive GndAttkRpt OlympianGndAttkRpt AirAttkRpt OlympianGndAttkRpt CastSpell [NONE] @@ -41474,10 +41170,35 @@ OlympianDeath: setfldirect 0 playfram 0x00 imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 5 lowsprul 236 0 0 # Maverick Remnants (terran\tmaDeath.grp) wait 1 end + +OlympianRevive: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1161 1162 + sprol 742 0 0 +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto OlympianWalkingToIdle OlympianGndAttkInit: sigorder 32 @@ -42172,26 +41893,10 @@ AxitriliskLocal00: goto AxitriliskWalkingToIdle AxitriliskDeath: - playsnd 867 # Zerg\Hydra\ZHyDth00.WAV - setfldirect 0 - playfram 442 - wait 2 - playfram 443 - wait 2 - playfram 444 - wait 2 - playfram 445 - wait 2 - playfram 446 - wait 2 - playfram 447 - wait 2 - playfram 448 - wait 2 - playfram 449 - wait 2 - lowsprul 726 0 0 # Axitrilisk Remnants (cm\zerg\axitrilisk-death.grp) + playsnd 1536 # Skithrokor death 01 + imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) wait 1 + lowsprul 849 0 0 # Zerg Unit Rubble Small end AxitriliskUnused1: @@ -42421,6 +42126,7 @@ AnthelionDeath: wait 1 imgol 214 0 0 wait 3 + lowsprul 224 0 42 # Protoss Building Rubble Large end AnthelionGndAttkInit: @@ -42550,7 +42256,8 @@ AnticthonDeath: wait 12 playsndbtwn 1393 1395 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small end AnticthonUnused1: @@ -43169,7 +42876,8 @@ EmpressWalkingToIdle: EmpressDeath: playsnd 533 imgol 214 0 0 # Explosion1 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium end EmpressGndAttkInit: @@ -43919,6 +43627,7 @@ MagnetarDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 273 0 42 # Terran Building Rubble Small end MagnetarUnused1: @@ -45169,6 +44878,7 @@ GosvilethDeath: playsnd 833 # Zerg\DRONE\ZDrDth00.WAV imgol 59 0 0 # Zerg Air Death Explosion (Small) (thingy\zAirDthS.grp) wait 1 + lowsprul 850 0 42 # Zerg Unit Rubble Tiny end GosvilethUnused1: @@ -45281,16 +44991,9 @@ ArtisanDeath: setfldirect 0 playsnd 598 # Protoss\PROBE\PPrDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - playfram 17 - wait 1 - playfram 18 - wait 1 - playfram 19 - wait 1 - playfram 20 - wait 1 - lowsprul 691 0 0 # Artisan Remnants (cm\protoss\Artisan-death.grp) - wait 1 + wait 2 + lowsprul 847 0 42 # Protoss Unit Rubble Small + wait 1 end ArtisanUnused1: @@ -47273,6 +46976,7 @@ SundogDeath: playsnd 257 # Terran\PHOENIX\TPhDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end SundogGndAttkInit: @@ -47338,7 +47042,7 @@ MatadorDeath: playsndbtwn 1385 1386 # Matador death 01, 02 imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 821 0 0 # Shaman Remains + lowsprul 845 0 0 # Terran Unit Rubble Small end MatadorUnused1: @@ -47517,7 +47221,8 @@ AncileGndAttkToIdle: AncileDeath: playsnd 257 # Terran\PHOENIX\TPhDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 845 0 42 # Terran Unit Rubble Small end AncileGndAttkInit: @@ -47594,7 +47299,8 @@ HippogriffWalkingToIdle: HippogriffDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) - wait 3 + wait 3 + lowsprul 274 0 42 # Terran Building Rubble Large end HippogriffGndAttkInit: @@ -47665,6 +47371,7 @@ WyvernDeath: playsnd 1120 # Zerg\ZergDuran\ZDnPss08.wav imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end WyvernGndAttkInit: @@ -47749,7 +47456,8 @@ ZarcavrokorWalkingToIdle: ZarcavrokorDeath: playsnd 852 # Zerg\Guardian\ZGuDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 1 + wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small end ZarcavrokorGndAttkInit: @@ -47987,6 +47695,7 @@ VagrantDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV imgol 153 0 0 # Zealot Death (protoss\zealot.grp) wait 1 + lowsprul 847 0 0 # Protoss Unit Rubble Small end VagrantUnused1: @@ -48187,6 +47896,7 @@ HeraldDeath: imgol 153 0 0 # Zealot Death (protoss\zealot.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 1 + lowsprul 846 0 0 # Protoss Unit Rubble Medium end HeraldUnused1: @@ -48338,7 +48048,8 @@ EpigraphWalkingToIdle: EpigraphDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) - wait 3 + wait 3 + lowsprul 223 0 42 # Protoss Building Rubble Small end EpigraphGndAttkInit: @@ -48448,7 +48159,7 @@ TethzorokorDeath: playsnd 1917 # Zoryusthaleth death 01 imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) wait 5 - lowsprul 158 0 0 # Ultrokor Remnants (zerg\zulDeath.grp) + lowsprul 848 0 0 # Zerg Unit Rubble Medium wait 1 end @@ -48629,6 +48340,7 @@ AionDeath: playsnd 353 # Terran\VULTURE\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) end AionUnused1: @@ -48734,7 +48446,7 @@ ProtathalorDeath: playsnd 867 # Zerg\Hydra\ZHyDth00.WAV imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) wait 5 - lowsprul 147 0 0 # Hydralisk Remnants (zerg\zhyDeath.grp) + lowsprul 849 0 0 # Zerg Unit Rubble Small wait 1 end @@ -48931,7 +48643,7 @@ VilgorokorDeath: playsnd 1917 # Zoryusthaleth death 01 imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) wait 5 - lowsprul 158 0 0 # Ultrokor Remnants (zerg\zulDeath.grp) + lowsprul 848 0 0 # Zerg Unit Rubble Medium wait 1 end @@ -49169,7 +48881,7 @@ CikraliskDeath: playsnd 867 # Zerg\Hydra\ZHyDth00.WAV imgol 3 0 0 # Skryling Death (zerg\zavDeath.grp) wait 5 - lowsprul 147 0 0 # Hydralisk Remnants (zerg\zhyDeath.grp) + lowsprul 849 0 0 # Zerg Unit Rubble Small wait 1 end @@ -49327,7 +49039,8 @@ TosgriliskLocal00: TosgriliskDeath: playsnd 942 # Zerg\Mutalid\ZMuDth00.WAV imgol 41 0 0 # Tosgrilisk Death (zerg\zmuDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end TosgriliskUnused1: @@ -49437,6 +49150,7 @@ GhitorokorDeath: # wait 1 # playfram 142 # wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end GhitorokorUnused1: @@ -49545,7 +49259,7 @@ ZobrioliskDeath: playsnd 1917 # Zoryusthaleth death 01 imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) wait 5 - lowsprul 158 0 0 # Ultrokor Remnants (zerg\zulDeath.grp) + lowsprul 848 0 0 # Zerg Unit Rubble Medium wait 1 end @@ -49702,6 +49416,7 @@ AzazelDeath: playsnd 257 # Terran\PHOENIX\TPhDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium end AzazelGndAttkInit: @@ -50005,6 +49720,7 @@ CataphractDeath: playsnd 985 # Terran\Duran\TDnPss05.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small # lowsprul 816 0 0 # Cataphract Remains end @@ -50119,6 +49835,7 @@ DurendalDeath: playsndbtwn 1598 1602 # Durendal death 01, 02, 03, 04, 05 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 844 0 0 # Terran Unit Rubble Medium end DurendalUnused1: @@ -50268,7 +49985,9 @@ SevenstepLocal01: SevenstepDeath: playsndbtwn 276 277 # Maverick death 01, 02 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 3 + wait 2 + lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + wait 1 end SevenstepGndAttkInit: @@ -50403,7 +50122,8 @@ TetcaerokorWalkingToIdle: TetcaerokorDeath: playsnd 852 # Zerg\Guardian\ZGuDth00.WAV imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 1 + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium end TetcaerokorGndAttkInit: @@ -50851,7 +50571,7 @@ HypnagogueWalking: IsId 711 Type 20 Init ApothecaryInit -Death InfestedCommandCenterDeath +Death AtelierDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -51196,6 +50916,7 @@ RamessesDeath: playsndbtwn 1598 1602 # Ramesses death 01, 02, 03, 04, 05 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small # lowsprul 816 0 0 # Ramesses Remains end @@ -51260,7 +50981,7 @@ RamessesWalking: IsId 716 Type 20 Init MantleInit -Death InfestedCommandCenterDeath +Death AtelierDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -51444,6 +51165,7 @@ ServitorDeath: imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 # lowsprul 816 0 0 # Servitor Remains + lowsprul 847 0 0 # Protoss Unit Rubble Small end ServitorUnused1: @@ -51519,6 +51241,7 @@ PositronDeath: playsnd 566 # Protoss\ARBITER\PAbDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 + lowsprul 846 0 0 # Protoss Unit Rubble Medium # lowsprul 816 0 0 # Positron Remains end @@ -51655,6 +51378,7 @@ SycophantDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV imgol 153 0 0 # Zealot Death (protoss\zealot.grp) wait 1 + lowsprul 847 0 0 # Protoss Unit Rubble Small end SycophantUnused1: @@ -52207,8 +51931,8 @@ OptectonDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 2 - lowsprul 192 0 0 # Dracadin Remnants (protoss\pdrDeath.grp) - wait 1 + lowsprul 846 0 0 # Protoss Unit Rubble Medium + wait 1 end OptectonGndAttkInit: @@ -52357,6 +52081,7 @@ PatriarchDeath: playsnd 635 # Protoss\TEMPLAR\PTeDth00.WAV imgol 153 0 0 # Zealot Death (protoss\zealot.grp) wait 1 + lowsprul 846 0 0 # Protoss Unit Rubble Medium end PatriarchUnused1: diff --git a/mpq/sound/cm/t/matador/agg-01.wav b/mpq/sound/cm/t/matador/agg-01.wav new file mode 100644 index 00000000..9776df8c Binary files /dev/null and b/mpq/sound/cm/t/matador/agg-01.wav differ diff --git a/mpq/sound/cm/t/matador/agg-02.wav b/mpq/sound/cm/t/matador/agg-02.wav new file mode 100644 index 00000000..23cebba8 Binary files /dev/null and b/mpq/sound/cm/t/matador/agg-02.wav differ diff --git a/mpq/sound/cm/t/matador/agg-03.wav b/mpq/sound/cm/t/matador/agg-03.wav new file mode 100644 index 00000000..a3b19b64 Binary files /dev/null and b/mpq/sound/cm/t/matador/agg-03.wav differ diff --git a/mpq/sound/cm/t/matador/agg-04.wav b/mpq/sound/cm/t/matador/agg-04.wav new file mode 100644 index 00000000..3e773cda Binary files /dev/null and b/mpq/sound/cm/t/matador/agg-04.wav differ diff --git a/mpq/sound/cm/t/matador/hlp-01.wav b/mpq/sound/cm/t/matador/hlp-01.wav new file mode 100644 index 00000000..750b256a Binary files /dev/null and b/mpq/sound/cm/t/matador/hlp-01.wav differ diff --git a/mpq/sound/cm/t/matador/hlp-02.wav b/mpq/sound/cm/t/matador/hlp-02.wav new file mode 100644 index 00000000..16e940b7 Binary files /dev/null and b/mpq/sound/cm/t/matador/hlp-02.wav differ diff --git a/mpq/sound/cm/t/matador/hlp-03.wav b/mpq/sound/cm/t/matador/hlp-03.wav new file mode 100644 index 00000000..09cafbf0 Binary files /dev/null and b/mpq/sound/cm/t/matador/hlp-03.wav differ diff --git a/mpq/sound/cm/t/matador/hlp-04.wav b/mpq/sound/cm/t/matador/hlp-04.wav new file mode 100644 index 00000000..2db6ff93 Binary files /dev/null and b/mpq/sound/cm/t/matador/hlp-04.wav differ diff --git a/mpq/sound/cm/t/matador/rdy-01.wav b/mpq/sound/cm/t/matador/rdy-01.wav new file mode 100644 index 00000000..c2e3e70c Binary files /dev/null and b/mpq/sound/cm/t/matador/rdy-01.wav differ diff --git a/mpq/sound/cm/t/matador/rdy-02.wav b/mpq/sound/cm/t/matador/rdy-02.wav new file mode 100644 index 00000000..80ebc2b8 Binary files /dev/null and b/mpq/sound/cm/t/matador/rdy-02.wav differ diff --git a/mpq/sound/cm/t/matador/rdy-03.wav b/mpq/sound/cm/t/matador/rdy-03.wav new file mode 100644 index 00000000..2bdefcfb Binary files /dev/null and b/mpq/sound/cm/t/matador/rdy-03.wav differ diff --git a/mpq/sound/cm/t/matador/wht-01.wav b/mpq/sound/cm/t/matador/wht-01.wav new file mode 100644 index 00000000..1a6c292e Binary files /dev/null and b/mpq/sound/cm/t/matador/wht-01.wav differ diff --git a/mpq/sound/cm/t/matador/wht-02.wav b/mpq/sound/cm/t/matador/wht-02.wav new file mode 100644 index 00000000..49ae4d3e Binary files /dev/null and b/mpq/sound/cm/t/matador/wht-02.wav differ diff --git a/mpq/sound/cm/t/matador/wht-03.wav b/mpq/sound/cm/t/matador/wht-03.wav new file mode 100644 index 00000000..7a1ba0ca Binary files /dev/null and b/mpq/sound/cm/t/matador/wht-03.wav differ diff --git a/mpq/sound/cm/t/matador/wht-04.wav b/mpq/sound/cm/t/matador/wht-04.wav new file mode 100644 index 00000000..9566c936 Binary files /dev/null and b/mpq/sound/cm/t/matador/wht-04.wav differ diff --git a/mpq/sound/cm/t/matador/yes-01.wav b/mpq/sound/cm/t/matador/yes-01.wav new file mode 100644 index 00000000..91bea432 Binary files /dev/null and b/mpq/sound/cm/t/matador/yes-01.wav differ diff --git a/mpq/sound/cm/t/matador/yes-02.wav b/mpq/sound/cm/t/matador/yes-02.wav new file mode 100644 index 00000000..666b61ff Binary files /dev/null and b/mpq/sound/cm/t/matador/yes-02.wav differ diff --git a/mpq/sound/cm/t/matador/yes-03.wav b/mpq/sound/cm/t/matador/yes-03.wav new file mode 100644 index 00000000..64616fa3 Binary files /dev/null and b/mpq/sound/cm/t/matador/yes-03.wav differ diff --git a/mpq/sound/cm/t/matador/yes-04.wav b/mpq/sound/cm/t/matador/yes-04.wav new file mode 100644 index 00000000..0c8aacde Binary files /dev/null and b/mpq/sound/cm/t/matador/yes-04.wav differ diff --git a/mpq/unit/cm/dummy.los b/mpq/unit/cm/dummy.los new file mode 100644 index 00000000..cfb9ec6e Binary files /dev/null and b/mpq/unit/cm/dummy.los differ diff --git a/mpq/unit/cm/protoss/legionnaire-shad.grp b/mpq/unit/cm/protoss/legionnaire-shad.grp index 348f5b88..c58be13f 100644 Binary files a/mpq/unit/cm/protoss/legionnaire-shad.grp and b/mpq/unit/cm/protoss/legionnaire-shad.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire.grp b/mpq/unit/cm/protoss/legionnaire.grp index 4871d4a1..52fb50b4 100644 Binary files a/mpq/unit/cm/protoss/legionnaire.grp and b/mpq/unit/cm/protoss/legionnaire.grp differ diff --git a/mpq/unit/cm/protoss/manifold-n.grp b/mpq/unit/cm/protoss/manifold-n.grp deleted file mode 100644 index d0cdf8fd..00000000 Binary files a/mpq/unit/cm/protoss/manifold-n.grp and /dev/null differ diff --git a/mpq/unit/cm/protoss/rubble-unit-medium.grp b/mpq/unit/cm/protoss/rubble-unit-medium.grp new file mode 100644 index 00000000..9a5f9fc2 Binary files /dev/null and b/mpq/unit/cm/protoss/rubble-unit-medium.grp differ diff --git a/mpq/unit/cm/protoss/rubble-unit-small.grp b/mpq/unit/cm/protoss/rubble-unit-small.grp new file mode 100644 index 00000000..2bd993d1 Binary files /dev/null and b/mpq/unit/cm/protoss/rubble-unit-small.grp differ diff --git a/mpq/unit/cm/terran/rubble-unit-medium.grp b/mpq/unit/cm/terran/rubble-unit-medium.grp new file mode 100644 index 00000000..7c731c7d Binary files /dev/null and b/mpq/unit/cm/terran/rubble-unit-medium.grp differ diff --git a/mpq/unit/cm/terran/rubble-unit-small.grp b/mpq/unit/cm/terran/rubble-unit-small.grp new file mode 100644 index 00000000..58653f45 Binary files /dev/null and b/mpq/unit/cm/terran/rubble-unit-small.grp differ diff --git a/mpq/unit/cm/terran/salvoyard-damage.lof b/mpq/unit/cm/terran/salvoyard-damage.lof deleted file mode 100644 index d9d1476e..00000000 Binary files a/mpq/unit/cm/terran/salvoyard-damage.lof and /dev/null differ diff --git a/mpq/unit/cm/terran/salvoyard-shad.grp b/mpq/unit/cm/terran/salvoyard-shad.grp deleted file mode 100644 index a14258c1..00000000 Binary files a/mpq/unit/cm/terran/salvoyard-shad.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/salvoyard.grp b/mpq/unit/cm/terran/salvoyard.grp deleted file mode 100644 index 6a0f9c41..00000000 Binary files a/mpq/unit/cm/terran/salvoyard.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/scrapyard-damage.lof b/mpq/unit/cm/terran/scrapyard-damage.lof index c1666f68..d9d1476e 100644 Binary files a/mpq/unit/cm/terran/scrapyard-damage.lof and b/mpq/unit/cm/terran/scrapyard-damage.lof differ diff --git a/mpq/unit/cm/terran/scrapyard-gas.los b/mpq/unit/cm/terran/scrapyard-gas.los deleted file mode 100644 index 4080ae0b..00000000 Binary files a/mpq/unit/cm/terran/scrapyard-gas.los and /dev/null differ diff --git a/mpq/unit/cm/terran/scrapyard-shad.grp b/mpq/unit/cm/terran/scrapyard-shad.grp index 38a4f6ad..a14258c1 100644 Binary files a/mpq/unit/cm/terran/scrapyard-shad.grp and b/mpq/unit/cm/terran/scrapyard-shad.grp differ diff --git a/mpq/unit/cm/terran/scrapyard.grp b/mpq/unit/cm/terran/scrapyard.grp index 0ebcecba..6a0f9c41 100644 Binary files a/mpq/unit/cm/terran/scrapyard.grp and b/mpq/unit/cm/terran/scrapyard.grp differ diff --git a/mpq/unit/cm/zerg/rubble-unit-medium.grp b/mpq/unit/cm/zerg/rubble-unit-medium.grp new file mode 100644 index 00000000..d3d61fc1 Binary files /dev/null and b/mpq/unit/cm/zerg/rubble-unit-medium.grp differ diff --git a/mpq/unit/cm/zerg/rubble-unit-small.grp b/mpq/unit/cm/zerg/rubble-unit-small.grp new file mode 100644 index 00000000..592f5b2f Binary files /dev/null and b/mpq/unit/cm/zerg/rubble-unit-small.grp differ diff --git a/mpq/unit/cm/zerg/rubble-unit-tiny.grp b/mpq/unit/cm/zerg/rubble-unit-tiny.grp new file mode 100644 index 00000000..bcf0b86d Binary files /dev/null and b/mpq/unit/cm/zerg/rubble-unit-tiny.grp differ diff --git a/mpq/unit/cm/zerg/unit-rubble-medium.grp b/mpq/unit/cm/zerg/unit-rubble-medium.grp new file mode 100644 index 00000000..d3d61fc1 Binary files /dev/null and b/mpq/unit/cm/zerg/unit-rubble-medium.grp differ diff --git a/mpq/unit/cm/zerg/unit-rubble-small.grp b/mpq/unit/cm/zerg/unit-rubble-small.grp new file mode 100644 index 00000000..592f5b2f Binary files /dev/null and b/mpq/unit/cm/zerg/unit-rubble-small.grp differ diff --git a/mpq/unit/cm/zerg/unit-rubble-tiny.grp b/mpq/unit/cm/zerg/unit-rubble-tiny.grp new file mode 100644 index 00000000..bcf0b86d Binary files /dev/null and b/mpq/unit/cm/zerg/unit-rubble-tiny.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index cf3dc0b7..56706d9b 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index 00a3ec9f..2bae885b 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 361802c9..452c84cd 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/tranwire.grp b/mpq/unit/wirefram/tranwire.grp index 3302e3c8..bea2e549 100644 Binary files a/mpq/unit/wirefram/tranwire.grp and b/mpq/unit/wirefram/tranwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index dcd6057a..18dfc47a 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index af641e8d..9e937f46 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -7,49 +7,124 @@ Note that the editor mpq has recently had its name changed. Adjust your SCMDraft Aside from that: More audiovisuals (thanks DarkenedFantasies and Solstice!), and more balance changes are coming your way! +## Gameplay +- All units (including lifted structures, excluding broodspawn and Stewards) now leave behind corpses +- Collision size updates: + - Matador, Legionnaire (enlarged to fit graphics) + ## Bugfixes - Mutated Zerg structures no longer fail to regress properly when killed mid-mutation (c. Veeq7) +- Matrix no longer deals double damage to its primary target (c. Veeq7) +- Legionnaire Blade Vortex: (c. Veeq7) + - Should now more reliably teleport when it can, and not teleport when it can't + - No longer has inaccuracies between overlay and actual debuff timer +- Anticthons no longer regenerate as Zerg units do - Nuking Seraphs no longer continue nuking if interrupted by a Didact Recall - Ancile Providence no longer appears to redirect attacks it does not actually redirect - Stim Pack description has been corrected +- Fixed a rare bug that caused corpses to spawn 255px lower than intended ## Audiovisuals - New sprite: - - Matador, Aurora (c. Solstice) + - Matador, Legionnaire, Aurora (c. Solstice) - Improved sprite: - Bunker: attack overlay is partially-transparent, casts light on the structure, and changes based on the garrisoned unit's race (c. DarkenedFantasies) - Ecclesiast: lighting/compositing pass (c. Solstice) - New SFX: - Terran structures play a sound when their landing sequence begins - Vulture Spider Mines play a sound when deployed -- Bunker now has an updated wireframe (c. jun3hong) +- New unit responses: + - Matador (c. Keyan) +- New wireframe: + - Bunker (c. jun3hong) +- New projectile launch positions: + - Matrix (c. Veeq7) +- New portrait: + - Ecclesiast ## Terran +- Apostle: + - Gas cost now 100, from 125 + - Now moves ~10% faster + - Lazarus Agent now reclaims all corpses within 4 range on activation, and no longer affects units - Spider Mine: - Arming time now ~5 seconds, from ~4.25 - Madrigal: - Furia Missile range now 4, from 5 - Furia Missile armor penetration now 1, from 2 +- Pazuzu: + - Gas cost now 50, from 100 + - Now moves ~11% faster + - Deconstruction now expires after 5 seconds +- Cuirass: + - Gas and time costs now 75/35, from 100/30 +- Claymore: + - Gas cost now 125, from 150 + - Now moves 22% faster + - Kelvin Munitions now expires after 3 seconds +- Anticthon: + - Counter-Proposal now reclaims all corpses within 3 range, and no longer provides any bonuses to the Anticthon +- Aion: + - Reclamation Fields now reclaim corpses and no longer affect units +- Atlas: + - Mineral and gas costs now 500/500, from 400/400 - Sentinel: - Mineral cost now 225, from 200 + - HP now 250, from 200 +- Daedala: + - Mineral and gas costs now 1200/1200, from 1000/1000 - Ion Cannon: - Weapon no longer follows targets ## Protoss -Barghest: +Legionnaire: + - Weapon range now 0.75, from ~0.5 + - Blade Vortex can now be procced by a single Legionnaire, instead of requiring two unique Legionnaires +Barghest: - Armor now 1, from 2 - Sight range now 5, from 7 - Armor penetration now 1, from 2 Cantavis: - Psionic Storm tick damage now 16, from 12; total damage now 128, from 96 +Patriarch: + - Astral Rule now expires after 2 seconds, and now heals any attacker's shields, isntead of healing nearby shields every tick +Panoptus: + - Time cost now 40, from 35 +Magister: + - Time cost now 35, from 30 + - Weapon damage now 18, from 16 + - Stellar Enforcement now expires after 3 seconds +Epigraph: + - HP now 220, from 250 + - Weapon range now 9, from 8 Didact: - Recall channel time now 5 seconds, from 3 +Warden: + - HP now 175, from 150 Matrix: + - HP now 120, from 100 - Shields now 80, from 60 + - Damage now 10, from 8 ## Zerg Mutalisk: - HP now 120, from 90 +Izirokor: + - Weapon range now 3, from 2 +Konvilisk: + - Weapon range now 7, from 6 + - Fertile Spines now spawns broodspawn immediately after the incubation period, and as such no longer stacks +Matraleth: + - Parasite now consumes corpses within 3 range of the target, and no longer affects units + - Gamete Meiosis removed Ultrokor: - HP now 440, from 400 - - Now moves ~9% faster \ No newline at end of file + - Now moves ~9% faster + - Weapon damage now 25, from 20 + - Armor penetration now 8, from 6 +Surkith Colony: + - HP now 275, from 250 +Spraith Colony: + - HP now 250, from 225 +Spirtith Colony: + - Weapon range now 9, from 8 \ No newline at end of file diff --git a/plugins/aise.qdp b/plugins/aise.qdp index 283d84f7..460a6a1e 100644 Binary files a/plugins/aise.qdp and b/plugins/aise.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 6c7de5e4..ebfadf44 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ