diff --git a/Cosmonarchy BW.exe b/Cosmonarchy BW.exe index 81f225b..7c75e5f 100644 Binary files a/Cosmonarchy BW.exe and b/Cosmonarchy BW.exe differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 700ee64..69ef0e0 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 068e169..f8a6a48 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.datex b/mpq/arr/images.datex index e2357c7..314987c 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 4bd0d93..4120d48 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 5085cf5..2a4fa7f 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 @@ -2038,9 +2038,9 @@ Healing Pulse Underlay Terran Heavy Missile Aion Corrosive Touch Explosion Skryrokor Death Reversed -Extended Image #1038 -Extended Image #1039 -Extended Image #1040 +Askosi Structure Rubble (Large) +Pilgrim +Pilgrim Shadow Extended Image #1041 Extended Image #1042 Extended Image #1043 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index b8d4692..68e7fec 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 d5c4c16..279c001 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) @@ -999,10 +999,10 @@ Manifold (Starbound) Yblyleth Corrosive Touch Explosion Terran Heavy Missile Aion -Extended Sprite #1 +Pilgrim Francisco Goska Stroluum -Extended Sprite #1 +Askosi Structure Rubble (Large) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index bb3b054..d219d27 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index e607a8e..8179949 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -437,10 +437,10 @@ Terran Maverick (Futurist) Zerg Hydralisk (Orkoti) Protoss Manifold (Starbound) Zerg Yblyleth (Zorthos) -Extended Unit #212 -Extended Unit #213 -Extended Unit #214 -Extended Unit #215 +Askosi Pilgrim +Basic Askosi Facilities +Advanced Askosi Facilities +Supreme Askosi Facilities Extended Unit #216 Extended Unit #217 Extended Unit #218 diff --git a/mpq/arr/upgrades.datex b/mpq/arr/upgrades.datex index f9872af..7b60f7d 100644 Binary files a/mpq/arr/upgrades.datex and b/mpq/arr/upgrades.datex differ diff --git a/mpq/arr/upgrades.txt b/mpq/arr/upgrades.txt index 698652d..9df5a2a 100644 --- a/mpq/arr/upgrades.txt +++ b/mpq/arr/upgrades.txt @@ -51,10 +51,10 @@ Argus Talisman (DA +50) Unknown Upgrade50 Caduceus Reactor (Medic +50) Chitinous Plating -Anabolic Synthesis -Charon Booster -Unknown Upgrade55 -Unknown Upgrade56 +Askosi Biotic Bolting +Askosi Mechani Bolting +Askosi Skyskip Bolting +Askosi Structure Bolting Protoss Structure Armor Zerg Structure Armor Terran Structure Armor diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 4ac461c..831508c 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 d22ccf9..c33fec4 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) @@ -237,7 +237,7 @@ Revenant Rifle (Nydus Eidolon) Gauss Slugger (Maverick Futurist) Needle Spores (Hydralisk Orkoti) Inzor Reflux (Inzorthrokor) -Extended Weapon #110 +Mining Saber (Pilgrim) Extended Weapon #111 Extended Weapon #112 Extended Weapon #113 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 72e085a..88f8491 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 857e632..e004b5a 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 28d0595..3bbcdaa 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 74681e0..511f92a 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 661689d..866028a 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index c256d7f..06279e8 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index 992a238..c04e00d 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -19,7 +19,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt [NONE] +AlmostBuilt SkryrokorLocal00 Built LandlockBuilt Landing [NONE] LiftOff [NONE] @@ -39,9 +39,8 @@ LandlockDeath: playsnd 7 # Misc\ExploLrg.wav imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) - # REPLACE RUBBLE - wait 1 + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + wait 1 end LandlockBuilt: @@ -99,4 +98,51 @@ ShadowHeaderInit: Generic_Wait1End: wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2040 Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) +.headerstart +IsId 145 +Type 1 +Init AskosiBuildingRubbleHeaderInit +Death AskosiBuildingRubbleHeaderDeath +.headerend +# ----------------------------------------------------------------------------- # + +AskosiBuildingRubbleHeaderInit: + playfram 0x00 +AskosiBuildingRubbleHeaderLocal00: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 +AskosiBuildingRubbleHeaderDeath: + playfram 4 + wait 239 + wait 1 + playfram 5 + wait 255 + wait 24 + playfram 6 + wait 255 + wait 24 + playfram 7 + wait 255 + wait 24 end \ No newline at end of file diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 5fea725..957475d 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 4b6a6a9..01ec784 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -168,7 +168,7 @@ Init DidactInit Death DidactDeath GndAttkInit DidactGndAttkInit AirAttkInit DidactGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt DidactGndAttkRpt AirAttkRpt DidactGndAttkRpt CastSpell DidactCastSpell @@ -415,7 +415,7 @@ Init ArchonBeingInit Death Generic_Wait1End GndAttkInit ArchonBeingGndAttkInit AirAttkInit ArchonBeingGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ArchonBeingGndAttkInit AirAttkRpt ArchonBeingGndAttkInit CastSpell [NONE] @@ -639,7 +639,7 @@ Init DarkTemplar_Hero_Init Death DarkTemplar_Hero_Death GndAttkInit DarkTemplar_Hero_GndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt DarkTemplar_Hero_GndAttkInit AirAttkRpt [NONE] CastSpell DarkTemplar_Hero_CastSpell @@ -896,7 +896,7 @@ Init StewardInit Death StewardDeath GndAttkInit StewardGndAttkInit AirAttkInit StewardGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt StewardGndAttkInit AirAttkRpt StewardGndAttkInit CastSpell [NONE] @@ -1047,7 +1047,7 @@ Init EnvoyInit Death EnvoyDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -1625,7 +1625,7 @@ Init WitnessInit Death WitnessDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -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] @@ -4844,13 +4844,13 @@ Init MindTyrantBeingInit Death Generic_Wait1End GndAttkInit MindTyrantBeingGndAttkInit AirAttkInit MindTyrantBeingGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MindTyrantBeingGndAttkInit AirAttkRpt MindTyrantBeingGndAttkInit CastSpell MindTyrantBeingCastSpell GndAttkToIdle MindTyrantBeingGndAttkToIdle AirAttkToIdle MindTyrantBeingGndAttkToIdle -Unused2 [NONE] +Unused2 SkryrokorLocal00 Walking MindTyrantBeingGndAttkToIdle WalkingToIdle MindTyrantBeingGndAttkToIdle SpecialState1 [NONE] @@ -5029,7 +5029,7 @@ Init LanifectInit Death LanifectDeath GndAttkInit LanifectAirAttkInit AirAttkInit LanifectAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt LanifectAirAttkInit AirAttkRpt LanifectAirAttkInit CastSpell LanifectCastSpell @@ -5387,7 +5387,7 @@ Init ExemplarInit Death ExemplarDeath GndAttkInit ExemplarGndAttkInit AirAttkInit ExemplarGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ExemplarGndAttkInit AirAttkRpt ExemplarGndAttkInit CastSpell [NONE] @@ -5830,7 +5830,7 @@ Init AuroraInit Death AuroraDeath GndAttkInit AuroraGndAttkInit AirAttkInit AuroraGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AuroraGndAttkInit AirAttkRpt AuroraGndAttkInit CastSpell [NONE] @@ -5908,7 +5908,7 @@ Init PanoptusInit Death PanoptusDeath GndAttkInit PanoptusGndAttkInit AirAttkInit PanoptusGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt PanoptusGndAttkInit AirAttkRpt PanoptusGndAttkInit CastSpell [NONE] @@ -6053,7 +6053,7 @@ Init SimulacrumInit Death SimulacrumDeath GndAttkInit SimulacrumGndAttkInit AirAttkInit SimulacrumGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SimulacrumGndAttkInit AirAttkRpt SimulacrumGndAttkInit CastSpell [NONE] @@ -6154,7 +6154,7 @@ Init EmpyreanInit Death EmpyreanDeath GndAttkInit EmpyreanGndAttkInit AirAttkInit EmpyreanGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt EmpyreanGndAttkInit AirAttkRpt EmpyreanGndAttkInit CastSpell [NONE] @@ -6522,7 +6522,7 @@ Init ExtatusInit Death AuroraDeath GndAttkInit AuroraGndAttkInit AirAttkInit AuroraGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AuroraGndAttkInit AirAttkRpt AuroraGndAttkInit CastSpell [NONE] @@ -7030,7 +7030,7 @@ Init GladiusInit Death GladiusDeath GndAttkInit GladiusGndAttkInit AirAttkInit GladiusGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt GladiusGndAttkInit AirAttkRpt GladiusGndAttkInit CastSpell [NONE] @@ -7103,7 +7103,7 @@ Init MagisterInit Death MagisterDeath GndAttkInit MagisterGndAttkInit AirAttkInit MagisterGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MagisterGndAttkInit AirAttkRpt MagisterGndAttkInit CastSpell [NONE] @@ -7184,7 +7184,7 @@ Init VassalInit Death VassalDeath GndAttkInit VassalGndAttkInit AirAttkInit VassalGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VassalGndAttkInit AirAttkRpt VassalGndAttkInit CastSpell [NONE] @@ -7439,7 +7439,7 @@ Init AtreusInit Death AtreusDeath GndAttkInit AtreusGndAttkInit AirAttkInit AtreusGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AtreusGndAttkInit AirAttkRpt AtreusGndAttkInit CastSpell [NONE] @@ -7557,7 +7557,7 @@ Init AmaranthInit Death AmaranthDeath GndAttkInit AmaranthGndAttkInit AirAttkInit AmaranthGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AmaranthGndAttkRpt AirAttkRpt AmaranthGndAttkRpt CastSpell AmaranthCastSpell @@ -7822,7 +7822,7 @@ Init IdolInit Death IdolDeath GndAttkInit IdolGndAttkInit AirAttkInit IdolGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt IdolGndAttkRpt AirAttkRpt IdolGndAttkRpt CastSpell [NONE] @@ -7915,7 +7915,7 @@ Init GolemInit Death GolemDeath GndAttkInit GolemGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt GolemGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -7980,7 +7980,7 @@ Init BarghestInit Death BarghestDeath GndAttkInit BarghestGndAttkInit AirAttkInit BarghestGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt BarghestGndAttkInit AirAttkRpt BarghestGndAttkInit CastSpell [NONE] @@ -8186,7 +8186,7 @@ Init PariahInit Death PariahDeath GndAttkInit PariahGndAttkInit AirAttkInit PariahGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt PariahGndAttkInit AirAttkRpt PariahGndAttkInit CastSpell [NONE] @@ -8530,7 +8530,7 @@ Init ManifoldInit Death ManifoldDeath GndAttkInit ManifoldGndAttkInit AirAttkInit ManifoldGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ManifoldGndAttkInit AirAttkRpt ManifoldGndAttkInit CastSpell [NONE] @@ -8605,7 +8605,7 @@ Init ArchitectInit Death ArchitectDeath GndAttkInit ArchitectGndAttkInit AirAttkInit ArchitectGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ArchitectGndAttkInit AirAttkRpt ArchitectGndAttkInit CastSpell [NONE] @@ -9690,7 +9690,7 @@ Init ClarionInit Death ClarionDeath GndAttkInit ClarionGndAttkToIdle AirAttkInit ClarionGndAttkToIdle -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ClarionGndAttkToIdle AirAttkRpt ClarionGndAttkToIdle CastSpell [NONE] @@ -9808,7 +9808,7 @@ Init LegionnaireInit Death LegionnaireDeath GndAttkInit LegionnaireGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt LegionnaireGndAttkRpt AirAttkRpt [NONE] CastSpell [NONE] @@ -9995,7 +9995,7 @@ Init DemiurgeInit Death DemiurgeDeath GndAttkInit DemiurgeGndAttkInit AirAttkInit DemiurgeGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt DemiurgeGndAttkInit AirAttkRpt DemiurgeGndAttkInit CastSpell [NONE] @@ -10255,7 +10255,7 @@ Init AnthelionInit Death AnthelionDeath GndAttkInit AnthelionGndAttkInit AirAttkInit AnthelionGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AnthelionGndAttkInit AirAttkRpt AnthelionGndAttkInit CastSpell [NONE] @@ -10676,7 +10676,7 @@ Init EmpressInit Death EmpressDeath GndAttkInit EmpressGndAttkInit AirAttkInit EmpressGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt EmpressGndAttkInit AirAttkRpt EmpressGndAttkInit CastSpell [NONE] @@ -12203,7 +12203,7 @@ Init EpigraphInit Death EpigraphDeath GndAttkInit EpigraphGndAttkInit AirAttkInit EpigraphGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt EpigraphGndAttkInit AirAttkRpt EpigraphGndAttkInit CastSpell [NONE] @@ -12782,7 +12782,7 @@ Init OptectonInit Death StarSovereignDeath GndAttkInit OptectonGndAttkInit AirAttkInit OptectonGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt OptectonGndAttkInit AirAttkRpt OptectonGndAttkInit CastSpell [NONE] @@ -13194,7 +13194,7 @@ Init AnalogueInit Death AnalogueDeath GndAttkInit AnalogueGndAttkInit AirAttkInit AnalogueGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AnalogueGndAttkInit AirAttkRpt AnalogueGndAttkInit CastSpell [NONE] @@ -13447,7 +13447,7 @@ Init AdherentInit Death LegionnaireDeath GndAttkInit AdherentGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AdherentGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -14278,7 +14278,7 @@ Init VibranceInit Death AnalogueDeath GndAttkInit VibranceGndAttkInit AirAttkInit VibranceGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VibranceGndAttkInit AirAttkRpt VibranceGndAttkInit CastSpell [NONE] @@ -14313,7 +14313,7 @@ Init CicatusInit Death LegionnaireDeath GndAttkInit LegionnaireGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt LegionnaireGndAttkRpt AirAttkRpt [NONE] CastSpell [NONE] @@ -14348,7 +14348,7 @@ Init OscilliantInit Death AtreusDeath GndAttkInit OscilliantGndAttkInit AirAttkInit OscilliantGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt OscilliantGndAttkRpt AirAttkRpt OscilliantGndAttkRpt CastSpell [NONE] @@ -14444,7 +14444,7 @@ Init RenesairInit Death RenesairDeath GndAttkInit VassalGndAttkInit AirAttkInit VassalGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VassalGndAttkInit AirAttkRpt VassalGndAttkInit CastSpell [NONE] @@ -14493,7 +14493,7 @@ Init UnarInit Death UnarDeath GndAttkInit UnarGndAttkInit AirAttkInit UnarGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt UnarGndAttkInit AirAttkRpt UnarGndAttkInit CastSpell [NONE] diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 989410c..1349fa8 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 0c905b0..2fbe972 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 @@ -81,10 +81,6 @@ SkryrokorLocal00: wait 125 goto SkryrokorLocal00 -Generic_Wait1End: - wait 1 - end - LiftedTerranStructureDeath: lowsprul 274 0 42 # Terran Building Rubble (Large) (thingy\RubbleL.grp) wait 1 @@ -174,7 +170,7 @@ Init TrojanInit Death TrojanDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -627,6 +623,10 @@ EidolonDeathInit: wait 1 end +Generic_Wait1End: + wait 1 + end + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 232 Nuke Beam (thingy\NukeBeam.grp) @@ -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 @@ -1820,7 +1820,7 @@ Init Phalanx_Tank_BaseInit Death Phalanx_Tank_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -1868,7 +1868,7 @@ Init InfestedTerranWalkingToIdle Death Generic_Wait1End GndAttkInit Phalanx_Tank_TurretGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt Phalanx_Tank_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -1906,7 +1906,7 @@ Init Phalanx_Siege_BaseInit Death Phalanx_Siege_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -1914,7 +1914,7 @@ GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 Phalanx_Siege_BaseSpecialState2 AlmostBuilt [NONE] @@ -2000,7 +2000,7 @@ Init Phalanx_Siege_TurretInit Death Generic_Wait1End GndAttkInit Phalanx_Siege_TurretGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt Phalanx_Siege_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -3456,7 +3456,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt [NONE] +AlmostBuilt SkryrokorLocal00 Built SkryrokorLocal00 Landing PalladiumConnectorLanding LiftOff PalladiumConnectorLiftOff @@ -3602,8 +3602,8 @@ CastSpell [NONE] GndAttkToIdle Watchdog_Turret_GndAttkToIdle AirAttkToIdle Watchdog_Turret_GndAttkToIdle Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt SkryrokorLocal00 @@ -4152,7 +4152,7 @@ AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] -Unused2 [NONE] +Unused2 SkryrokorLocal00 Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] @@ -6582,7 +6582,7 @@ Init ValkyrieInit Death ValkyrieDeath GndAttkInit ValkyrieAirAttkInit AirAttkInit ValkyrieAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ValkyrieAirAttkInit AirAttkRpt ValkyrieAirAttkInit CastSpell [NONE] @@ -7298,7 +7298,7 @@ GndAttkRpt MadrigalImperiosoTurretGndAttkInit AirAttkRpt MadrigalImperiosoTurretGndAttkInit CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 -AirAttkToIdle [NONE] +AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 @@ -7354,7 +7354,7 @@ GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 MadrigalFuriaBaseSpecialState2 AlmostBuilt [NONE] @@ -7899,7 +7899,7 @@ Init SavantPowerSiphonInit Death MadcapDeath GndAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt CastSpell [NONE] @@ -7932,7 +7932,7 @@ Init SavantInit Death MadcapDeath GndAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt CastSpell [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 @@ -13719,14 +13719,14 @@ CastSpell [NONE] GndAttkToIdle IonCannonAttackAInit AirAttkToIdle IonCannonAttackAInit Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing [NONE] -LiftOff [NONE] +Landing SkryrokorLocal00 +LiftOff SkryrokorLocal00 IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] @@ -14495,7 +14495,7 @@ FusionCutterHitDamagelessDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 296 Sentinel (Base) +# 1544 Sentinel (Base) (cm\terran\sentinel-base.grp) .headerstart IsId 666 Type 20 @@ -14567,14 +14567,14 @@ Sentinel_Base_Landing: goto SkryrokorLocal00 Sentinel_Base_Built: - imgol 1545 0 0 # Sentinel (Turret) + imgol 1545 0 0 # Sentinel (Turret) (cm\terran\sentinel-turret.grp) Sentinel_Base_WorkingToIdle: playfram 2 goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 297 Sentinel (Turret) +# 1545 Sentinel (Turret) (cm\terran\sentinel-turret.grp) .headerstart IsId 667 Type 24 @@ -14589,8 +14589,8 @@ CastSpell [NONE] GndAttkToIdle Sentinel_Turret_GndAttkToIdle AirAttkToIdle Sentinel_Turret_GndAttkToIdle Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt SkryrokorLocal00 @@ -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 @@ -17166,7 +17166,7 @@ MatadorCinderModeSpecialState2: # 1523 Matador Tank Mode Turret (cm\terran\matador-turret.grp) .headerstart IsId 738 -Type 12 +Type 13 Init InfestedTerranWalkingToIdle Death Generic_Wait1End GndAttkInit MatadorGndAttkInit @@ -17180,7 +17180,7 @@ AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking MatadorWalking WalkingToIdle InfestedTerranWalkingToIdle -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -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 46c5fa3..2b4efc4 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 14c34fd..bf7394d 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] @@ -271,7 +271,7 @@ InfestedTerranExplosionInit: # 011 Zerg Cocoon (zerg\cocoon.grp) .headerstart IsId 8 -Type 14 +Type 21 Init ZergCocoonInit Death ZergCocoonDeath GndAttkInit [NONE] @@ -288,6 +288,12 @@ WalkingToIdle [NONE] SpecialState1 ZergCocoonSpecialState1 SpecialState2 ZergCocoonSpecialState2 AlmostBuilt ZergCocoonAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -4931,7 +4937,7 @@ Init VorvrokorInit Death VorvrokorDeath GndAttkInit VorvrokorGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VorvrokorGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -6286,7 +6292,7 @@ Init GorgrokorInit Death GorgrokorDeath GndAttkInit GorgrokorGndAttkInit AirAttkInit GorgrokorAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt GorgrokorGndAttkInit AirAttkRpt GorgrokorAirAttkInit CastSpell [NONE] @@ -6398,7 +6404,7 @@ Init IrolethInit Death IrolethDeath GndAttkInit IrolethGndAttkInit AirAttkInit IrolethGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt IrolethGndAttkInit AirAttkRpt IrolethGndAttkInit CastSpell [NONE] @@ -6812,7 +6818,7 @@ Init OthstolethInit Death OthstolethDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -6988,7 +6994,7 @@ Init NathrokorInit Death NathrokorDeath GndAttkInit NathrokorGndAttkInit AirAttkInit NathrokorAirAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt NathrokorGndAttkInit AirAttkRpt NathrokorAirAttkInit CastSpell [NONE] @@ -7134,7 +7140,7 @@ Init AlkajeliskInit Death AlkajeliskDeath GndAttkInit AlkajeliskGndAttkInit AirAttkInit AlkajeliskGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AlkajeliskGndAttkInit AirAttkRpt AlkajeliskGndAttkInit CastSpell [NONE] @@ -7222,7 +7228,7 @@ Init KeskathalorInit Death KeskathalorDeath GndAttkInit KeskathalorGndAttkInit AirAttkInit KeskathalorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt KeskathalorGndAttkRpt AirAttkRpt KeskathalorGndAttkRpt CastSpell [NONE] @@ -9583,7 +9589,7 @@ Init AkistrokorInit Death AkistrokorDeath GndAttkInit AkistrokorGndAttkInit AirAttkInit AkistrokorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt AkistrokorGndAttkInit AirAttkRpt AkistrokorGndAttkInit CastSpell [NONE] @@ -10411,7 +10417,7 @@ Init SovrolethInit Death SovrolethDeath GndAttkInit SovrolethGndAttkInit AirAttkInit SovrolethGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SovrolethGndAttkInit AirAttkRpt SovrolethGndAttkInit CastSpell SovrolethCastSpell @@ -10426,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 @@ -12315,7 +12321,7 @@ Init ZarcavrokorInit Death ZarcavrokorDeath GndAttkInit ZarcavrokorGndAttkInit AirAttkInit ZarcavrokorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt ZarcavrokorGndAttkInit AirAttkRpt ZarcavrokorGndAttkInit CastSpell ZarcavrokorCastSpell @@ -13748,7 +13754,7 @@ Init TetcaerokorInit Death TetcaerokorDeath GndAttkInit TetcaerokorGndAttkInit AirAttkInit TetcaerokorGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt TetcaerokorGndAttkInit AirAttkRpt TetcaerokorGndAttkInit CastSpell TetcaerokorCastSpell @@ -14504,7 +14510,7 @@ Init NathreliskInit Death NathreliskDeath GndAttkInit NathreliskGndAttkInit AirAttkInit NathreliskGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt NathreliskGndAttkInit AirAttkRpt NathreliskGndAttkInit CastSpell [NONE] @@ -14855,11 +14861,11 @@ IsId 773 Type 26 Init OkrimniliskInit Death CherbrathalorDeath -GndAttkInit [NONE] -AirAttkInit [NONE] +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 Unused1 OkrimniliskUnused1 -GndAttkRpt [NONE] -AirAttkRpt [NONE] +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 CastSpell [NONE] GndAttkToIdle OkrimniliskGndAttkToIdle AirAttkToIdle OkrimniliskGndAttkToIdle @@ -15043,7 +15049,7 @@ Init SasyrvolethInit Death SasyrvolethDeath GndAttkInit SasyrvolethGndAttkInit AirAttkInit SasyrvolethGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt SasyrvolethGndAttkInit AirAttkRpt SasyrvolethGndAttkInit CastSpell [NONE] @@ -15944,7 +15950,7 @@ Init VithriliskInit Death VithriliskDeath GndAttkInit VithriliskGndAttkInit AirAttkInit VithriliskGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VithriliskGndAttkInit AirAttkRpt VithriliskGndAttkInit CastSpell [NONE] @@ -16235,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 # ----------------------------------------------------------------------------- # @@ -16249,5 +16267,4 @@ SkryrokorDeathReversedInit: tmprmgraphicend playfram 0x00 wait 1 - wait 1 - end + goto Generic_Wait1End diff --git a/mpq/unit/cm/askosi/a-rubble-large.grp b/mpq/unit/cm/askosi/a-rubble-large.grp new file mode 100644 index 0000000..5df8b0e Binary files /dev/null and b/mpq/unit/cm/askosi/a-rubble-large.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 9df69bd..904f2b4 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 4a71af3..d9e4a28 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ