diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 068e1694..f8a6a48e 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -34,7 +34,7 @@ Ultrav Cavern Excisant Hydrith Den Muthrok Spire -Spraith Colony +Spraith Cesiant Didact Archon Energy Solarion diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 1f4ae4c0..2a4fa7f6 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -95,10 +95,10 @@ Excisant Excisant Shadow Hydrith Den Hydrith Den Shadow -Muthrok Spire -Muthrok Spire Shadow -Spraith Colony -Spraith Colony Shadow +Mutath Spire +Mutath Spire Shadow +Spraith Cesiant +Spraith Cesiant Shadow Infested Ministry Overlay Zerg Construction (Large) Zerg Building Morph diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 0d5c6695..279c0016 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -175,11 +175,11 @@ Matravil Nest Nydus Cesiant Overmind With Shell Overmind Without Shell -Ultrok Cavern +Ultrav Cavern Excisant Hydrith Den Mutath Spire -Spraith Colony +Spraith Cesiant Zerg Building Spawn (Small) Zerg Building Spawn (Medium) Zerg Building Spawn (Large) diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index f90eaeed..c33fec43 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -50,8 +50,8 @@ Glave Wurm (Mutalisk) Parasitic Spores (Alkajelisk) Corrosive Acid (Bactalisk) Jupiter Driver (Pazuzu) -Seeker Spores (Spraith Colony) -Subterranean Tentacle (Surkith Colony) +Seeker Spores (Spraith Cesiant) +Subterranean Tentacle (Surkith Cesiant) Skittering Spores (Skithrokor) Suicide (Skryrokor) Parasitic Excision (Matraleth ability) diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 2b2ebb41..957475d7 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 0fe20595..01ec7842 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -4056,7 +4056,7 @@ AirAttkRpt Generic_Wait1End CastSpell Generic_Wait1End GndAttkToIdle Generic_Wait1End AirAttkToIdle Generic_Wait1End -Unused2 [NONE] +Unused2 SkryrokorLocal00 Walking Engines_GlowHeaderInit WalkingToIdle Generic_Wait1End SpecialState1 [NONE] @@ -14313,7 +14313,7 @@ Init CicatusInit Death LegionnaireDeath GndAttkInit LegionnaireGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt LegionnaireGndAttkRpt AirAttkRpt [NONE] CastSpell [NONE] diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index baaccda9..1349fa8c 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index af104a7a..2fbe972f 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -8,7 +8,7 @@ Init MinotaurInit Death MinotaurDeath GndAttkInit MinotaurGndAttkInit AirAttkInit MinotaurAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MinotaurGndAttkInit AirAttkRpt MinotaurAirAttkInit CastSpell MinotaurCastSpell @@ -170,7 +170,7 @@ Init TrojanInit Death TrojanDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -867,7 +867,7 @@ Init SarahKerriganInit Death SarahKerriganDeath GndAttkInit SarahKerriganGndAttkInit AirAttkInit SarahKerriganGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SarahKerriganGndAttkRpt AirAttkRpt SarahKerriganGndAttkRpt CastSpell SarahKerriganCastSpell @@ -1342,7 +1342,7 @@ Init WraithInit Death WraithDeath GndAttkInit WraithGndAttkInit AirAttkInit WraithGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt WraithGndAttkInit AirAttkRpt WraithGndAttkInit CastSpell [NONE] @@ -1741,7 +1741,7 @@ Init SeraphBaseInit Death SeraphBaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell SeraphBaseCastSpell @@ -1793,7 +1793,7 @@ Init SeraphTurretInit Death Generic_Wait1End GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell SkryrokorLocal00 @@ -1914,7 +1914,7 @@ GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 Phalanx_Siege_BaseSpecialState2 AlmostBuilt [NONE] @@ -6582,7 +6582,7 @@ Init ValkyrieInit Death ValkyrieDeath GndAttkInit ValkyrieAirAttkInit AirAttkInit ValkyrieAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ValkyrieAirAttkInit AirAttkRpt ValkyrieAirAttkInit CastSpell [NONE] @@ -7354,7 +7354,7 @@ GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 MadrigalFuriaBaseSpecialState2 AlmostBuilt [NONE] @@ -7972,7 +7972,7 @@ Init PytheanInit Death PytheanDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -8951,7 +8951,7 @@ Init SalamanderInit Death SalamanderDeath GndAttkInit SalamanderGndAttkInit AirAttkInit SalamanderAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SalamanderGndAttkInit AirAttkRpt SalamanderAirAttkInit CastSpell [NONE] @@ -9076,7 +9076,7 @@ Init GorgonInit Death GorgonDeath GndAttkInit GorgonGndAttkInit AirAttkInit GorgonGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt GorgonGndAttkInit AirAttkRpt GorgonGndAttkInit CastSpell [NONE] @@ -9127,7 +9127,7 @@ Init PhobosInit Death PhobosDeath GndAttkInit PhobosGndAttkInit AirAttkInit PhobosGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt PhobosGndAttkInit AirAttkRpt PhobosGndAttkInit CastSpell PhobosCastSpell @@ -12263,7 +12263,7 @@ Init ClaymoreInit Death ClaymoreDeath GndAttkInit ClaymoreGndAttkInit AirAttkInit ClaymoreGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ClaymoreGndAttkInit AirAttkRpt ClaymoreGndAttkInit CastSpell [NONE] @@ -12327,7 +12327,7 @@ Init SirenInit Death SirenDeath GndAttkInit SirenGndAttkInit AirAttkInit SirenGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SirenGndAttkInit AirAttkRpt SirenGndAttkInit CastSpell SirenCastSpell @@ -12866,7 +12866,7 @@ Init AutocratInit Death AutocratDeath GndAttkInit AutocratGndAttkInit AirAttkInit AutocratGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AutocratGndAttkRpt AirAttkRpt AutocratGndAttkRpt CastSpell [NONE] @@ -13105,7 +13105,7 @@ Init StrigaInit Death StrigaDeath GndAttkInit StrigaGndAttkInit AirAttkInit StrigaGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt StrigaGndAttkInit AirAttkRpt StrigaGndAttkInit CastSpell [NONE] @@ -13251,7 +13251,7 @@ Init LuminaryInit Death LuminaryDeath GndAttkInit LuminaryGndAttkInit AirAttkInit LuminaryGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt LuminaryGndAttkInit AirAttkRpt LuminaryGndAttkInit CastSpell LuminaryCastSpell @@ -14711,7 +14711,7 @@ Init SundogInit Death SundogDeath GndAttkInit SundogGndAttkInit AirAttkInit SundogGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SundogGndAttkInit AirAttkRpt SundogGndAttkInit CastSpell [NONE] @@ -14953,7 +14953,7 @@ Init AncileInit Death AncileDeath GndAttkInit AncileGndAttkInit AirAttkInit AncileGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AncileGndAttkInit AirAttkRpt AncileGndAttkInit CastSpell AncileCastSpell @@ -15023,7 +15023,7 @@ Init HippogriffInit Death HippogriffDeath GndAttkInit HippogriffGndAttkInit AirAttkInit HippogriffAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt HippogriffGndAttkInit AirAttkRpt HippogriffAirAttkInit CastSpell [NONE] @@ -15114,7 +15114,7 @@ Init WyvernInit Death WyvernDeath GndAttkInit WyvernGndAttkInit AirAttkInit WyvernGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt WyvernGndAttkInit AirAttkRpt WyvernGndAttkInit CastSpell WyvernCastSpell @@ -15351,7 +15351,7 @@ Init AzazelInit Death AzazelDeath GndAttkInit AzazelGndAttkToIdle AirAttkInit AzazelGndAttkToIdle -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AzazelGndAttkToIdle AirAttkRpt AzazelGndAttkToIdle CastSpell AzazelCastSpell @@ -15415,7 +15415,7 @@ Init WendigoInit Death WendigoDeath GndAttkInit WendigoGndAttkInit AirAttkInit WendigoGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt WendigoGndAttkInit AirAttkRpt WendigoGndAttkInit CastSpell [NONE] @@ -15490,7 +15490,7 @@ Init SouthpawInit Death SouthpawDeath GndAttkInit SouthpawGndAttkInit AirAttkInit SouthpawGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SouthpawGndAttkInit AirAttkRpt SouthpawGndAttkInit CastSpell [NONE] @@ -15572,7 +15572,7 @@ Init CyprianInit Death CyprianDeath GndAttkInit CyprianGndAttkInit AirAttkInit CyprianGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt CyprianGndAttkRpt AirAttkRpt CyprianGndAttkRpt CastSpell CyprianCastSpell @@ -15906,7 +15906,7 @@ Init SevenstepInit Death SevenstepDeath GndAttkInit SevenstepGndAttkInit AirAttkInit SevenstepGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SevenstepGndAttkRpt AirAttkRpt SevenstepGndAttkRpt CastSpell SevenstepCastSpell @@ -17280,7 +17280,7 @@ GndAttkToIdle ShamanVisionaryModeGndAttkToIdle AirAttkToIdle ShamanVisionaryModeGndAttkToIdle Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SkryrokorLocal00 SpecialState1 ShamanVisionaryModeSpecialState2 SpecialState2 ShamanVisionaryModeSpecialState2 AlmostBuilt [NONE] @@ -17385,7 +17385,7 @@ Init PhilocInit Death PhilocDeath GndAttkInit PhilocGndAttkInit AirAttkInit PhilocGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt PhilocGndAttkInit AirAttkRpt PhilocGndAttkInit CastSpell [NONE] @@ -17602,7 +17602,7 @@ Init HotshotInit Death MadcapDeath GndAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt CastSpell [NONE] @@ -17629,7 +17629,7 @@ Init QilinInit Death QilinDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 552c8d5a..2b4efc48 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index ee40b298..bf7394d9 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -141,7 +141,7 @@ Init RilirokorInit Death RilirokorDeath GndAttkInit RilirokorGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt RilirokorGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -6292,7 +6292,7 @@ Init GorgrokorInit Death GorgrokorDeath GndAttkInit GorgrokorGndAttkInit AirAttkInit GorgrokorAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt GorgrokorGndAttkInit AirAttkRpt GorgrokorAirAttkInit CastSpell [NONE] @@ -6404,7 +6404,7 @@ Init IrolethInit Death IrolethDeath GndAttkInit IrolethGndAttkInit AirAttkInit IrolethGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt IrolethGndAttkInit AirAttkRpt IrolethGndAttkInit CastSpell [NONE] @@ -6818,7 +6818,7 @@ Init OthstolethInit Death OthstolethDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -6994,7 +6994,7 @@ Init NathrokorInit Death NathrokorDeath GndAttkInit NathrokorGndAttkInit AirAttkInit NathrokorAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt NathrokorGndAttkInit AirAttkRpt NathrokorAirAttkInit CastSpell [NONE] @@ -7140,7 +7140,7 @@ Init AlkajeliskInit Death AlkajeliskDeath GndAttkInit AlkajeliskGndAttkInit AirAttkInit AlkajeliskGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AlkajeliskGndAttkInit AirAttkRpt AlkajeliskGndAttkInit CastSpell [NONE] @@ -7228,7 +7228,7 @@ Init KeskathalorInit Death KeskathalorDeath GndAttkInit KeskathalorGndAttkInit AirAttkInit KeskathalorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt KeskathalorGndAttkRpt AirAttkRpt KeskathalorGndAttkRpt CastSpell [NONE] @@ -9589,7 +9589,7 @@ Init AkistrokorInit Death AkistrokorDeath GndAttkInit AkistrokorGndAttkInit AirAttkInit AkistrokorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AkistrokorGndAttkInit AirAttkRpt AkistrokorGndAttkInit CastSpell [NONE] @@ -10417,7 +10417,7 @@ Init SovrolethInit Death SovrolethDeath GndAttkInit SovrolethGndAttkInit AirAttkInit SovrolethGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SovrolethGndAttkInit AirAttkRpt SovrolethGndAttkInit CastSpell SovrolethCastSpell @@ -10432,7 +10432,7 @@ SpecialState1 [NONE] SovrolethInit: imgul 1405 0 42 # Sovroleth Shadow (cm\zerg\sovroleth.grp) - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 SovrolethGndAttkToIdle: playfram 0x11 @@ -12321,7 +12321,7 @@ Init ZarcavrokorInit Death ZarcavrokorDeath GndAttkInit ZarcavrokorGndAttkInit AirAttkInit ZarcavrokorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ZarcavrokorGndAttkInit AirAttkRpt ZarcavrokorGndAttkInit CastSpell ZarcavrokorCastSpell @@ -13754,7 +13754,7 @@ Init TetcaerokorInit Death TetcaerokorDeath GndAttkInit TetcaerokorGndAttkInit AirAttkInit TetcaerokorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt TetcaerokorGndAttkInit AirAttkRpt TetcaerokorGndAttkInit CastSpell TetcaerokorCastSpell @@ -14510,7 +14510,7 @@ Init NathreliskInit Death NathreliskDeath GndAttkInit NathreliskGndAttkInit AirAttkInit NathreliskGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt NathreliskGndAttkInit AirAttkRpt NathreliskGndAttkInit CastSpell [NONE] @@ -15049,7 +15049,7 @@ Init SasyrvolethInit Death SasyrvolethDeath GndAttkInit SasyrvolethGndAttkInit AirAttkInit SasyrvolethGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SasyrvolethGndAttkInit AirAttkRpt SasyrvolethGndAttkInit CastSpell [NONE] @@ -15950,7 +15950,7 @@ Init VithriliskInit Death VithriliskDeath GndAttkInit VithriliskGndAttkInit AirAttkInit VithriliskGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VithriliskGndAttkInit AirAttkRpt VithriliskGndAttkInit CastSpell [NONE] @@ -16241,9 +16241,21 @@ DurendalWeaponfireInit: # 2039 Skryrokor Death Reversed (zerg\zavDeath.grp) .headerstart IsId 828 -Type 0 +Type 12 Init SkryrokorDeathReversedInit -Death [NONE] +Death Generic_Wait1End +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 +Unused1 SkryrokorLocal00 +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 +CastSpell SkryrokorLocal00 +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 SkryrokorLocal00 +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -16255,5 +16267,4 @@ SkryrokorDeathReversedInit: tmprmgraphicend playfram 0x00 wait 1 - wait 1 - end + goto Generic_Wait1End diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index b11bdce8..0378da27 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ