diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 0766148..e337ba7 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 124cea3..b1d278e 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -214,7 +214,7 @@ Vespene Ridge Iroleth Matrix Paladin -Madrigal +Madrigal (Imperioso) Savant (Entropy Gauntlets) Scrapyard Rotary @@ -584,17 +584,17 @@ Radix Cardinal Vicar Missionary -Extended Flingy #378 -Extended Flingy #379 -Extended Flingy #380 -Extended Flingy #381 -Extended Flingy #382 -Extended Flingy #383 -Extended Flingy #384 -Extended Flingy #385 -Extended Flingy #386 -Extended Flingy #387 -Extended Flingy #388 +Emissary +Inkblot +Vulture (Hecaton) +Tartarus Mine (Hecaton) +Madrigal (Hecaton, Imperioso) +Madrigal Turret (Hecaton, Imperioso) +Madrigal (Hecaton, Furia) +Madrigal Turret (Hecaton, Furia) +Rove +Burst Lasers Green Impact +Burst Lasers Cyan Impact Extended Flingy #389 Extended Flingy #390 Extended Flingy #391 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 47f5717..c7dce32 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 7ee5af2..ca5fddd 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 ea0f764..d8f8645 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1,8 +1,8 @@ -Skryling -Skryling Shadow -Skryling Birth -Skryling Death -Skryling Explosion +Skryrokor +Skryrokor Shadow +Skryrokor Birth +Skryrokor Death +Skryrokor Explosion Rilirokor Rilirokor Shadow Rilirokor Remains @@ -2089,27 +2089,27 @@ Power Siphon Hit (Medium) Power Siphon Hit (Large) Askosi Death Explosion Small Askosi Death Explosion Large -Extended Image #1089 -Extended Image #1090 -Extended Image #1091 -Extended Image #1092 -Extended Image #1093 -Extended Image #1094 -Extended Image #1095 -Extended Image #1096 -Extended Image #1097 -Extended Image #1098 -Extended Image #1099 -Extended Image #1100 -Extended Image #1101 -Extended Image #1102 -Extended Image #1103 -Extended Image #1104 -Extended Image #1105 -Extended Image #1106 -Extended Image #1107 -Extended Image #1108 -Extended Image #1109 +Wraith Death Explosion +Emissary +Emissary Shadow +Emissary Engines +Inkblot +Inkblot Shadow +Inkblot Engines +Vulture (Hecaton) +Vulture (Hecaton) Shadow +Tartarus Mine (Hecaton) +Tartarus Mine (Hecaton) Shadow +Madrigal (Hecaton, Imperioso) +Madrigal (Hecaton, Imperioso) Shadow +Madrigal Turret (Hecaton, Imperioso) +Madrigal (Hecaton, Furia) +Madrigal Turret (Hecaton, Furia) +Zoryusthaleth Mutate +Rove +Rove Shadow +Burst Lasers Green Impact +Burst Lasers Cyan Impact Extended Image #1110 Extended Image #1111 Extended Image #1112 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 1fcf5e2..644e9e3 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/orders.txt b/mpq/arr/orders.txt index 05fe32f..8583354 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -10,7 +10,7 @@ Attack Attack (Obscured) Attack Unit (Normal) Attack In Range -Attack Ground (Unused) +Rematerialize (Askosi) Salvage (Talos) Attack Move Building Is Being Infested diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index 6454cdf..f6c5322 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 3e8a615..37a7456 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 d2c2e46..c3fcea7 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -278,7 +278,7 @@ Justicar Kiraxxar Demiurge Scanner Sweep Aurora -Extended Portrait #171 +Iziralisk Extended Portrait #172 Extended Portrait #173 Extended Portrait #174 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 123b2f0..925d6e2 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3600,30 +3600,30 @@ Goku Advisor - No Vespene 03 Goku Advisor - No Vespene 04 Goku Advisor - Warp 01 Goku Advisor - Warp 02 -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 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Eidolon Windup 01 +Eidolon Windup 02 +Eidolon Windup 03 +Eidolon Weaponfire 01 +Eidolon Weaponfire 02 +Eidolon Weaponfire 03 +Bulwark Ambient Proc 01 +Bulwark Ambient Proc 02 +Bulwark Ambient Proc 03 +Crucible Ambient 01 +Stockade Ambient 01 +Fulcrum Ambient 01 +Starpad Ambient 01 +Ministry Ambient 01 +Nexus Ambient 01 +Gateway Ambient 01 +Lattice Ambient 01 +Embassy Ambient 01 +Stargate Ambient 01 +Egg Ambient 01 +Egg Ambient 02 +Egg Ambient 03 +Egg Ambient 04 +Treasury Ambient 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index be6aeea..65f6448 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1753,8 +1753,8 @@ cm\t\pazuzu\yes-01.wav cm\t\pazuzu\yes-02.wav cm\t\pazuzu\yes-03.wav cm\t\pazuzu\yes-04.wav -cm\t\_building\biotic-base.wav -cm\t\_building\fulcrum.wav +cm\t\_building\biotic-bastion.wav +cm\t\_building\fulcrum\wht-01.wav cm\t\_building\future-station.wav cm\t\_building\iron-foundry.wav cm\t\_building\nanite-assembly.wav @@ -1762,7 +1762,7 @@ cm\t\_building\quarry.wav cm\t\_building\scrapyard.wav cm\t\_building\tinkerers-tower.wav cm\p\_building\astral-omen.wav -cm\p\_building\crucible.wav +cm\p\_building\crucible\wht-01.wav cm\p\_building\grand-library.wav cm\p\_building\monument-of-sin.wav cm\p\_building\pennant.wav @@ -2110,17 +2110,17 @@ cm\z\_building\almakis-antre.wav cm\z\_building\liivral-pond.wav cm\z\_building\sibraelosk.wav cm\z\_building\izkag-iteth.wav -cm\t\_building\barracks.wav +cm\t\_building\stockade\wht-01.wav cm\t\_building\medbay.wav cm\t\_building\scrapyard.wav -cm\t\_building\starpad.wav +cm\t\_building\starpad\wht-01.wav cm\t\_building\starport.wav -cm\t\_building\munitions-bay.wav +cm\t\_building\rotary.wav cm\t\apostle\cast-02.wav cm\t\apostle\cast-03.wav cm\e\energy-start.wav cm\e\energy-end.wav -cm\t\_building\bunker.wav +cm\t\_building\anchor.wav cm\t\_building\sentinel.wav cm\t\_building\future-station.wav cm\p\_building\matrix.wav @@ -2476,7 +2476,7 @@ cm\t\shaman\switch-02.wav cm\t\shaman\switch-03.wav protoss\advisor\paderr03.wav protoss\advisor\padupd03.wav -cm\t\_building\treasury.wav +cm\t\_building\treasury\wht-01.wav cm\t\silvertongue\wf-01.wav cm\t\silvertongue\wf-02.wav cm\t\silvertongue\wf-03.wav @@ -2794,7 +2794,7 @@ cm\t\savant\siphon-05.wav protoss\fenixd\rdy-01.wav protoss\fenixz\rdy-01.wav protoss\tassadar\rdy-01.wav -cm\p\_building\stargate.wav +cm\p\_building\stargate\wht-01.wav cm\p\hierophant\wht-01.wav cm\p\hierophant\wht-02.wav cm\p\hierophant\wht-03.wav @@ -2856,7 +2856,7 @@ cm\z\bactalisk\wh-02.wav cm\z\bactalisk\wh-03.wav cm\p\hierophant\wf-01.wav cm\p\hierophant\wf-02.wav -cm\t\_building\ministry.wav +cm\t\_building\ministry\wht-01.wav cm\t\phalanx\wh2-01.wav cm\p\exemplar\dth-01.wav cm\advisors\iskatumesk\meskad_allyattack-p-01.wav @@ -3483,9 +3483,9 @@ cm\f-t\tiangou\wf-02.wav cm\f-t\tiangou\wf-03.wav cm\f-t\tiangou\wf-04.wav cm\f-t\tiangou\wf-05.wav -cm\t\_building\facade-cast-01.wav -cm\t\_building\facade-off-01.wav -cm\t\_building\facade.wav +cm\t\_building\facade\cast-01.wav +cm\t\_building\facade\off-01.wav +cm\t\_building\facade\wht-01.wav cm\t\_building\cestus.wav cm\z\cikralisk\rdy-01.wav cm\z\cikralisk\rdy-01.wav @@ -3599,4 +3599,28 @@ cm\advisors\goku\gokuad_vespene-02.wav cm\advisors\goku\gokuad_vespene-03.wav cm\advisors\goku\gokuad_vespene-04.wav cm\advisors\goku\gokuad_warp-01.wav -cm\advisors\goku\gokuad_warp-02.wav \ No newline at end of file +cm\advisors\goku\gokuad_warp-02.wav +cm\t\eidolon\windup-01.wav +cm\t\eidolon\windup-02.wav +cm\t\eidolon\windup-03.wav +cm\t\eidolon\wf-01.wav +cm\t\eidolon\wf-02.wav +cm\t\eidolon\wf-03.wav +cm\p\_building\bulwark\proc-01.wav +cm\p\_building\bulwark\proc-02.wav +cm\p\_building\bulwark\proc-03.wav +cm\p\_building\crucible\amb-01.wav +cm\t\_building\stockade\amb-01.wav +cm\t\_building\fulcrum\amb-01.wav +cm\t\_building\starpad\amb-01.wav +cm\t\_building\ministry\amb-01.wav +cm\p\_building\nexus\amb-01.wav +cm\p\_building\gateway\amb-01.wav +cm\p\_building\lattice\amb-01.wav +cm\p\_building\embassy\amb-01.wav +cm\p\_building\stargate\amb-01.wav +cm\z\egg\amb-01.wav +cm\z\egg\amb-02.wav +cm\z\egg\amb-03.wav +cm\z\egg\amb-04.wav +cm\t\_building\treasury\amb-01.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 54c9071..a0867aa 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 cddd8a3..993325c 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -515,7 +515,7 @@ Corrosive Acid Hit Maelstrom Hit Uraj Khalis -Matador +Matador (Tank Mode) Starpad Matrix Iroleth @@ -1033,17 +1033,17 @@ Missionary Remains Power Siphon (Small) Power Siphon (Medium) Power Siphon (Large) -Extended Sprite #519 -Extended Sprite #520 -Extended Sprite #521 -Extended Sprite #522 -Extended Sprite #523 -Extended Sprite #524 -Extended Sprite #525 -Extended Sprite #526 -Extended Sprite #527 -Extended Sprite #528 -Extended Sprite #529 +Emissary +Inkblot +Vulture (Hecaton) +Tartarus Mine (Hecaton) +Madrigal (Hecaton, Imperioso) +Madrigal Turret (Hecaton, Imperioso) +Madrigal (Hecaton, Furia) +Madrigal Turret (Hecaton, Furia) +Rove +Burst Lasers Green Impact +Burst Lasers Cyan Impact Extended Sprite #530 Extended Sprite #531 Extended Sprite #532 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 43cc9aa..9e7663d 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/techdata.txt b/mpq/arr/techdata.txt index 70b34fc..e20363f 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -21,7 +21,7 @@ Psionic Storm (Cantavis) Hallucination (Cantavis) Recall (Didact) Stasis Field (Didact) -Archon Warp (unused) +Rematerialize Savant Onhit Toggle Disruption Field (Lanifect) Rescind Control (Mind Tyrant) diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index c159d0c..50076d4 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 3d569da..16b2fa4 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -373,7 +373,7 @@ Terran Matador (Cinder Mode) Terran Cuirass (Trench Mode) Matador Turret (Tank Mode) Matador Turret (Cinder Mode) -Lobotomy Mine +Terran Lobotomy Mine Wyvern Turret Zerg Axitrilisk (Weaponless) Zerg Vilgoleth @@ -496,18 +496,18 @@ Terran Ogun (Worker Mode) Protoss Autocort Terran Cannibal (Upstart) Terran Ogun (Smithy Mode) -Extended Unit #271 -Extended Unit #272 +Buttonset Basic Zerg Mutations +Buttonset Advanced Zerg Mutations Francisco Goska Stroluum Cerebrate Tuzor Zerg Skryrokor -Extended Unit #277 -Extended Unit #278 -Extended Unit #279 -Extended Unit #280 -Extended Unit #281 -Extended Unit #282 +Terran Madrigal (Hecaton, Imperioso) +Madrigal Turret (Hecaton, Imperioso) +Terran Vulture (Hecaton) +Terran Tartarus Mine (Hecaton) +Terran Madrigal (Hecaton, Furia) +Madrigal Turret (Hecaton, Furia) Extended Unit #283 Extended Unit #284 Extended Unit #285 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 5f9d6a6..70990ca 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 15a51db..757424d 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -1,6 +1,6 @@ Gauss Rifle (Maverick) Javelin Cannons (Heracles) -C-10 Concussion Rifle (Eidolon) +Coroner Rifle (Eidolon) Charon Rifle (Apostle) Fragmentation Grenade (Vulture) Haymaker Autogun (Cuirass) @@ -124,7 +124,7 @@ Ospo Twinshard (Vicar) Titan's Fist (Olympian) Mountain Gun (Olympian) Jackson Cannon (Wyvern) -Skyfall (Paladin ability) +Elre Scaleshot (Rove) Enthralling Assault (Akistrokor ability) Final Hour (Augur behavior) Hammerfall Beacon (Diadem) @@ -188,7 +188,7 @@ Particle Ray (Autocort) Ironhand Weaver (Patriarch) Angeltear Missiles (Madrigal Hecaton) Massive Mandible (Agrileth) -Congealing Spores (Elthrazalisk) +Apollyoid Conflagration (Tartarus Mine) Plasma Shell (Accantor) Wicked Incisors (Mortothrokor) Recycled Blaster (Servitor) @@ -199,13 +199,13 @@ Khaydarin Plasma Laser (Engram) Ion Cannon (Diadem) Discoid Railgun (Savant Entropy) Geometric Rifle (Sevenstep, Piercing) -Twinstrike Cannons (Matador) +Providence (Piety Ward) Cylindrical Blaster (Analogue) Heirloom Batteries (Philoc) Nathrok Claws (Nathrokor) Calcification (Gorgrokor) Talismanic Weaver (Potentate) -Phase Saber (Potentate) +Rematerialize (Askosi) Dispatch Shotgun (Hotshot) Quarternary Rifle (Auriel) Phase Blade (Adherent) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index b67a80d..d843e84 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 2fe2dd0..701ad17 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 8c7c6c5..16b7281 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 8f9ee11..eb01c56 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 83b2120..722f8c1 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/faction/iziralisk/fid00.smk b/mpq/portrait/faction/iziralisk/fid00.smk new file mode 100644 index 0000000..0a0cbc7 Binary files /dev/null and b/mpq/portrait/faction/iziralisk/fid00.smk differ diff --git a/mpq/portrait/faction/iziralisk/fid01.smk b/mpq/portrait/faction/iziralisk/fid01.smk new file mode 100644 index 0000000..b1d28b2 Binary files /dev/null and b/mpq/portrait/faction/iziralisk/fid01.smk differ diff --git a/mpq/portrait/faction/iziralisk/tlk00.smk b/mpq/portrait/faction/iziralisk/tlk00.smk new file mode 100644 index 0000000..c35cab5 Binary files /dev/null and b/mpq/portrait/faction/iziralisk/tlk00.smk differ diff --git a/mpq/portrait/zerg/izirokor/fid00.smk b/mpq/portrait/zerg/izirokor/fid00.smk index 0a0cbc7..a4f518c 100644 Binary files a/mpq/portrait/zerg/izirokor/fid00.smk and b/mpq/portrait/zerg/izirokor/fid00.smk differ diff --git a/mpq/portrait/zerg/izirokor/fid01.smk b/mpq/portrait/zerg/izirokor/fid01.smk index b1d28b2..ba0a3aa 100644 Binary files a/mpq/portrait/zerg/izirokor/fid01.smk and b/mpq/portrait/zerg/izirokor/fid01.smk differ diff --git a/mpq/portrait/zerg/izirokor/fid02.smk b/mpq/portrait/zerg/izirokor/fid02.smk new file mode 100644 index 0000000..93cf023 Binary files /dev/null and b/mpq/portrait/zerg/izirokor/fid02.smk differ diff --git a/mpq/portrait/zerg/izirokor/tlk00.smk b/mpq/portrait/zerg/izirokor/tlk00.smk index c35cab5..be60435 100644 Binary files a/mpq/portrait/zerg/izirokor/tlk00.smk and b/mpq/portrait/zerg/izirokor/tlk00.smk differ diff --git a/mpq/portrait/zerg/izirokor/tlk01.smk b/mpq/portrait/zerg/izirokor/tlk01.smk new file mode 100644 index 0000000..b8fcde4 Binary files /dev/null and b/mpq/portrait/zerg/izirokor/tlk01.smk differ diff --git a/mpq/portrait/zerg/izirokor/tlk02.smk b/mpq/portrait/zerg/izirokor/tlk02.smk new file mode 100644 index 0000000..34fdf99 Binary files /dev/null and b/mpq/portrait/zerg/izirokor/tlk02.smk differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index b33f9f6..746448b 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 a33f4f2..81cc39b 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 4fa0f75..5ccd198 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index e2bfe3c..218bcf6 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 182ce51..8110ff7 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -2,7 +2,7 @@ # This header is used by images.dat entries: # 1997 Landlock (cm\askosi\landlock.grp) .headerstart -IsId 812 +IsId 1 Type 21 Init LandlockInit Death LandlockDeath @@ -190,8 +190,8 @@ AskosiBuildingRubbleHeaderDeath: # This header is used by images.dat entries: # 2041 Pilgrim (cm\askosi\pilgrim.grp) .headerstart -IsId 84 -Type 15 +IsId 2 +Type 21 Init PilgrimInit Death PilgrimDeath GndAttkInit PilgrimGndAttkInit @@ -204,99 +204,118 @@ GndAttkToIdle PilgrimGndAttkToIdle AirAttkToIdle [NONE] Unused2 [NONE] Walking PilgrimWalking -WalkingToIdle InfestedTerranWalkingToIdle +WalkingToIdle PilgrimWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt PilgrimAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # PilgrimInit: - imgul 2042 0 0 # Pilgrim Shadow (cm\askosi\pilgrim-shadow.grp) - goto InfestedTerranWalkingToIdle + imgul 2042 0 0 # Legionnaire Shadow (cm\protoss\legionnaire-shad.grp) + goto PilgrimWalkingToIdle PilgrimDeath: - playsnd 369 # Terran\SCV\TSCDth00.WAV - imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 2 - lowsprul 809 0 0 # Pilgrim Remnants (cm\terran\mason-remnants.grp) - wait 1 + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + setfldirect 0 + wait 8 + lowsprul 1029 0 0 # Vicar Remnants (cm\askosi\vicar-remnants.grp) + wait 1 end PilgrimUnused1: wait 1 nobrkcodestart - tmprmgraphicstart - playsnd 1168 - wait 8 - sprol 742 0 0 # Small Explosion Reversed + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed wait 10 - setfldirect 12 - tmprmgraphicend + setfldirect 12 nobrkcodeend - goto InfestedTerranWalkingToIdle + goto PilgrimWalkingToIdle PilgrimGndAttkInit: - wait 1 - nobrkcodestart - playfram 0xaa - attackwith 1 - playsndbtwn 35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav - wait 1 - playfram 0x99 - wait 1 - nobrkcodeend - gotorepeatattk - goto PilgrimGndAttkToIdle - + playfram 0x100 +PilgrimGndAttkRpt: + playfram 0x120 + nobrkcodestart + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + attackmelee 1 1897 # Legionnaire weapon hit 01 + wait 1 + playfram 0x180 + wait 1 + nobrkcodeend + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x120 + wait 1 + gotorepeatattk + ignorerest PilgrimGndAttkToIdle: - playfram 0x00 - goto SkryrokorLocal00 + playfram 0x100 + wait 1 + goto PilgrimWalkingToIdle PilgrimWalking: - playfram 0x11 - move 4 - wait 1 - playfram 0x22 - move 4 - wait 1 - playfram 0x33 - move 4 - wait 1 - playfram 0x44 - move 4 - wait 1 - playfram 0x55 - move 4 - wait 1 - playfram 0x66 - move 4 - wait 1 - playfram 0x77 - move 4 - wait 1 - playfram 0x88 - move 4 - wait 1 + move 4 + wait 1 + playfram 0x20 + move 4 + wait 1 + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 goto PilgrimWalking + +PilgrimWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 PilgrimAlmostBuilt: setvertpos 0 wait 1 PilgrimLocal00: - playfram 0xbb + playfram 0x160 useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) sigorder 32 - wait 3 - playfram 0x99 - wait 10 + wait 2 + playfram 0x140 + wait 2 + playfram 0x120 + wait 9 goto PilgrimLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 2069 Arch (cm\askosi\arch.grp) .headerstart -IsId 802 +IsId 3 Type 20 Init ArchInit Death ArchDeath @@ -375,7 +394,7 @@ ArchLocal01: # This header is used by images.dat entries: # 2075 Radix (cm\askosi\radix.grp) .headerstart -IsId 96 +IsId 6 Type 24 Init RadixInit Death LandlockDeath @@ -433,11 +452,77 @@ RadixIsWorking: RadixDisable: goto SkryrokorLocal00 +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2071 Chantry (cm\askosi\chantry.grp) +.headerstart +IsId 4 +Type 24 +Init ChantryInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle ChantryIsWorking +SpecialState1 ChantrySpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt ChantryAlmostBuilt +Built ChantryBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking ChantryIsWorking +WorkingToIdle ChantryBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable ChantryDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ChantryInit: + playfram 0x00 + imgul 2072 0 0 # Chantry Shadow (cm\askosi\chantry-shadow.grp) + goto ChantryIsWorking + +ChantrySpecialState1: + playfram 0 + goto SkryrokorLocal00 + +ChantryAlmostBuilt: + playfram 0 + goto SkryrokorLocal00 + +ChantryBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +ChantryIsWorking: + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 0 + wait 12 + goto ChantryIsWorking + +ChantryDisable: + goto SkryrokorLocal00 + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 2073 Function (cm\askosi\function.grp) .headerstart -IsId 111 +IsId 5 Type 24 Init FunctionInit Death LandlockDeath @@ -499,7 +584,7 @@ FunctionDisable: # This header is used by images.dat entries: # 2083 Missionary (cm\askosi\missionary.grp) .headerstart -IsId 69 +IsId 7 Type 12 Init MissionaryInit Death MissionaryDeath @@ -662,7 +747,7 @@ MissionaryWalking: # This header is used by images.dat entries: # 2077 Cardinal (cm\askosi\cardinal.grp) .headerstart -IsId 497 +IsId 8 Type 12 Init CardinalInit Death CardinalDeath @@ -766,7 +851,7 @@ CardinalWalking: # This header is used by images.dat entries: # 2080 Vicar (cm\askosi\vicar.grp) .headerstart -IsId 498 +IsId 9 Type 12 Init VicarInit Death VicarDeath @@ -775,7 +860,7 @@ AirAttkInit [NONE] Unused1 VicarUnused1 GndAttkRpt VicarGndAttkRpt AirAttkRpt [NONE] -CastSpell [NONE] +CastSpell VicarCastSpell GndAttkToIdle VicarGndAttkToIdle AirAttkToIdle [NONE] Unused2 [NONE] @@ -832,6 +917,20 @@ VicarGndAttkRpt: VicarGndAttkToIdle: goto VicarWalkingToIdle +VicarCastSpell: + playfram 0x88 + wait 1 + nobrkcodestart + playfram 0xbb + wait 1 + playfram 0xcc + wait 1 + castspell + nobrkcodeend + sigorder 2 + gotorepeatattk + goto VicarWalkingToIdle + VicarWalking: move 4 wait 1 @@ -854,4 +953,183 @@ VicarWalking: move 4 wait 1 playfram 0x11 - goto VicarWalking \ No newline at end of file + goto VicarWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2092 Emissary (cm\askosi\emissary.grp) +.headerstart +IsId 10 +Type 12 +Init EmissaryInit +Death EmissaryDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 SkryrokorLocal00 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell EmissaryCastSpell +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking EmissaryWalking +WalkingToIdle EmissaryLocal00 +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +EmissaryInit: + imgul 2093 0 42 # Emissary Shadow (cm\askosi\emissary.grp) + playfram 0x00 +EmissaryLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto EmissaryLocal00 + +EmissaryDeath: + playsnd 210 # Terran\DROPSHIP\TDrDth00.wav + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 920 0 42 # Emissary remains + wait 1 + end + +EmissaryCastSpell: + nobrkcodestart + wait 3 + castspell + nobrkcodeend + gotorepeatattk + sigorder 2 + goto EmissaryLocal00 + +EmissaryWalking: + setvertpos 0 +# imgol 225 0 5 # Emissary Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2095 Inkblot (cm\askosi\inkblot.grp) +.headerstart +IsId 11 +Type 12 +Init InkblotInit +Death InkblotDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 SkryrokorLocal00 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking InkblotWalking +WalkingToIdle InkblotLocal00 +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +InkblotInit: + imgul 2096 0 42 # Inkblot Shadow (cm\askosi\inkblot.grp) + playfram 0x00 +InkblotLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto InkblotLocal00 + +InkblotDeath: + playsnd 210 # Terran\DROPSHIP\TDrDth00.wav + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 920 0 42 # Inkblot remains + wait 1 + end + +InkblotWalking: + setvertpos 0 +# imgol 225 0 5 # Inkblot Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2108 Rove (cm\askosi\rove.grp) +.headerstart +IsId 12 +Type 13 +Init RoveInit +Death RoveDeath +GndAttkInit RoveGndAttkInit +AirAttkInit [NONE] +Unused1 RoveUnused1 +GndAttkRpt RoveGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle RoveGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking RoveWalking +WalkingToIdle RoveGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +RoveInit: + imgul 2109 0 7 # Rove Shadow (cm\askosi\rove.grp) + playfram 0x00 + goto RoveGndAttkToIdle + +RoveGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto RoveGndAttkToIdle + +RoveDeath: + playsnd 353 # Terran\Rove\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 +# lowsprul 813 0 0 # Rove Remains + end + +RoveUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Rove revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto RoveGndAttkToIdle + +RoveGndAttkInit: + wait 1 + attackwith 1 + playsnd 106 # Bullet\tvuFir00.wav + gotorepeatattk + goto RoveGndAttkToIdle + +RoveWalking: + playfram 0x00 + setvertpos 0 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 7f311f3..f67328e 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 3d25768..27d8031 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -2507,7 +2507,7 @@ GndAttkToIdle WardenGndAttkToIdle AirAttkToIdle WardenGndAttkToIdle Unused2 [NONE] Walking [NONE] -WalkingToIdle [NONE] +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -6758,7 +6758,7 @@ StarSovereignLocal01: goto StarSovereignLocal03 StarSovereignLocal02: - imgul 1253 0 60 + imgul 1253 0 60 # Grief of All Gods Loop wait 6 sigorder 64 StarSovereignLocal03: @@ -10877,9 +10877,29 @@ NeutronFlareDamagelessInit: # 1455 Anthelion Teleport (Departure) (cm\protoss\anthelion-teleport-depart.grp) .headerstart IsId 631 -Type 0 +Type 21 Init AnthelionTeleportDepartInit -Death [NONE] +Death SkryrokorLocal00 +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 +Unused1 SkryrokorLocal00 +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 +CastSpell [NONE] +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -10909,33 +10929,33 @@ AnthelionTeleportDepartInit: IsId 632 Type 27 Init AnthelionTeleportArriveInit -Death [NONE] -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built [NONE] -Landing [NONE] -LiftOff [NONE] -IsWorking [NONE] -WorkingToIdle [NONE] -WarpIn [NONE] -Unused3 [NONE] -StarEditInit [NONE] -Disable [NONE] -Burrow [NONE] -UnBurrow [NONE] -Enable [NONE] +Death SkryrokorLocal00 +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 +Unused1 SkryrokorLocal00 +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 +CastSpell SkryrokorLocal00 +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 SkryrokorLocal00 +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 SkryrokorLocal00 +SpecialState2 SkryrokorLocal00 +AlmostBuilt SkryrokorLocal00 +Built SkryrokorLocal00 +Landing SkryrokorLocal00 +LiftOff SkryrokorLocal00 +IsWorking SkryrokorLocal00 +WorkingToIdle SkryrokorLocal00 +WarpIn SkryrokorLocal00 +Unused3 SkryrokorLocal00 +StarEditInit SkryrokorLocal00 +Disable SkryrokorLocal00 +Burrow SkryrokorLocal00 +UnBurrow SkryrokorLocal00 +Enable SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # @@ -11195,7 +11215,7 @@ Unused2 [NONE] Walking ArtisanWalking WalkingToIdle ArtisanWalkingToIdle SpecialState1 [NONE] -SpecialState2 [NONE] +SpecialState2 ArtisanSpecialState2 AlmostBuilt ArtisanAlmostBuilt Built [NONE] Landing [NONE] @@ -11220,6 +11240,26 @@ ArtisanLocal00: wait 2 playfram 0x80 wait 2 + playfram 0xA0 + wait 2 + playfram 0xC0 + wait 2 + playfram 0xE0 + wait 2 + playfram 0x100 + wait 2 + playfram 0x120 + wait 2 + playfram 0x140 + wait 2 + playfram 0x160 + wait 2 + playfram 0x180 + wait 2 + playfram 0x1A0 + wait 2 + playfram 0x1C0 + wait 2 playfram 0x00 goto ArtisanLocal00 @@ -11269,11 +11309,63 @@ ArtisanWalking: wait 1 playfram 0x80 wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 1 + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 1 + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 playfram 0x00 goto ArtisanWalking ArtisanWalkingToIdle: goto ArtisanLocal00 + +ArtisanSpecialState2: + playfram 0x20 + wait 2 + playfram 0x40 + wait 2 + playfram 0x60 + wait 2 + playfram 0x80 + wait 2 + playfram 0xA0 + wait 2 + playfram 0xC0 + wait 2 + playfram 0xE0 + wait 2 + playfram 0x100 + wait 2 + playfram 0x120 + wait 2 + playfram 0x140 + wait 2 + playfram 0x160 + wait 2 + playfram 0x180 + wait 2 + playfram 0x1A0 + wait 2 + playfram 0x1C0 + wait 2 + playfram 0x00 + goto ArtisanSpecialState2 ArtisanAlmostBuilt: useweapon 63 # Particle Beam (Harvest) @@ -11281,13 +11373,34 @@ ArtisanAlmostBuilt: playfram 0x20 wait 1 playfram 0x40 - wait 2 + wait 1 playfram 0x60 - wait 2 + wait 1 playfram 0x80 - wait 2 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 1 + useweapon 63 # Particle Beam (Harvest) + playsnd 614 # Protoss\PROBE\PPrMin00.WAV + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 1 + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 playfram 0x00 - wait 1 goto ArtisanAlmostBuilt ArtisanWarpIn: @@ -14379,13 +14492,13 @@ IsId 800 Type 21 Init CicatusInit Death LegionnaireDeath -GndAttkInit LegionnaireGndAttkInit +GndAttkInit CicatusGndAttkInit AirAttkInit [NONE] Unused1 SkryrokorLocal00 -GndAttkRpt LegionnaireGndAttkRpt +GndAttkRpt CicatusGndAttkRpt AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle LegionnaireGndAttkToIdle +GndAttkToIdle CicatusGndAttkToIdle AirAttkToIdle [NONE] Unused2 [NONE] Walking LegionnaireWalking @@ -14405,6 +14518,31 @@ WarpIn LegionnaireWarpIn CicatusInit: imgul 1959 0 0 # Cicatus Shadow (cm\faction-p\cicatus-shadow.grp) goto GolemWalkingToIdle + +CicatusGndAttkInit: + playfram 0x100 +CicatusGndAttkRpt: + playfram 0x120 + nobrkcodestart + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + attackmelee 1 1897 # Legionnaire weapon hit 01 + wait 1 + playfram 0x180 + wait 1 + nobrkcodeend + playfram 0x1A0 + wait 1 + playfram 0x120 + wait 1 + gotorepeatattk + ignorerest +CicatusGndAttkToIdle: + playfram 0x100 + wait 1 + goto GolemWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index bbd4816..ad6f0fd 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 8efc4f5..a7081f8 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -521,6 +521,8 @@ EidolonGndAttkInit: playfram 0x11 wait 1 playfram 0x22 + playsndbtwn 3602 3604 # Eidolon windup 01, 02, 03 + wait 12 EidolonGndAttkRpt: wait 1 nobrkcodestart @@ -1374,6 +1376,7 @@ WraithGndAttkToIdle: WraithDeath: playsnd 257 # Terran\PHOENIX\TPhDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) +# imgol 2091 0 0 # Wraith Death Explosion (cm\terran\wraith-death.grp) wait 3 lowsprul 822 0 42 # Wraith Remains (cm\terran\wraith-remains.grp) end @@ -15264,7 +15267,7 @@ WyvernGndAttkInit: goto WyvernGndAttkToIdle WyvernCastSpell: - sigorder 64 + sigorder 128 wait 1 nobrkcodestart castspell @@ -19303,4 +19306,408 @@ PowerSiphonInit: wait 1 playfram 2 goto Generic_Wait1End - \ No newline at end of file + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2091 Wraith Death (cm\terran\wraith-death.grp) +.headerstart +IsId 832 +Type 0 +Init WraithDeathInit +Death [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +WraithDeathInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2100 Tartarus Mine (cm\faction-t\tartarus-mine.grp) +.headerstart +IsId 833 +Type 26 +Init TartarusMineInit +Death TartarusMineDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 TartarusMineUnused2 +Walking TartarusMineWalking +WalkingToIdle TartarusMineWalkingToIdle +SpecialState1 TartarusMineSpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow TartarusMineBurrow +UnBurrow TartarusMineUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +TartarusMineInit: + imgul 2101 0 0 # Tartarus Mine Shadow (cm\faction-t\tartarus-mine-shadow.grp) +TartarusMineWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +TartarusMineDeath: + playsnd 10 # Misc\Explo1.wav + 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 + wait 1 + end + +TartarusMineWalking: + playsnd 355 # Terran\VULTURE\TVuMin00.WAV + move 16 + wait 1 + playfram 0x00 + move 16 + wait 1 + playfram 1 + move 16 + wait 1 + playfram 2 + move 16 + wait 1 + playfram 3 + move 16 + wait 1 + playfram 4 + move 16 + wait 1 + playfram 5 + move 16 + wait 1 + playfram 6 + move 16 + wait 1 + playfram 7 + goto TartarusMineWalking + +TartarusMineSpecialState1: + castspell + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +TartarusMineUnused2: + sigorder 32 + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +TartarusMineBurrow: + nobrkcodestart + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + sigorder 4 + nobrkcodeend + goto SkryrokorLocal00 + +TartarusMineUnBurrow: + nobrkcodestart + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 10 + wait 1 + playfram 9 + wait 1 + playfram 8 + wait 1 + playfram 0x00 + sigorder 4 + nobrkcodeend + goto TartarusMineWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2104 Madrigal (Hecaton, Imperioso) Turret (cm\terran\madrigal-turret.grp) +.headerstart +IsId 834 +Type 13 +Init MadrigalHecatonImperiosoTurretInit +Death Generic_Wait1End +GndAttkInit MadrigalHecatonImperiosoTurretGndAttkInit +AirAttkInit MadrigalHecatonImperiosoTurretGndAttkInit +Unused1 [NONE] +GndAttkRpt MadrigalHecatonImperiosoTurretGndAttkInit +AirAttkRpt MadrigalHecatonImperiosoTurretGndAttkInit +CastSpell [NONE] +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 SkryrokorLocal00 +.headerend +# ----------------------------------------------------------------------------- # + +MadrigalHecatonImperiosoTurretInit: + playfram 0x20 + goto SkryrokorLocal00 + +MadrigalHecatonImperiosoTurretGndAttkInit: + wait 1 + nobrkcodestart + wait 2 + playfram 0x00 + wait 1 + playsndbtwn 1208 1211 # Madrigal weaponfire 01, 02, 03, 04 + attack + playfram 0x20 + wait 1 + nobrkcodeend + gotorepeatattk + goto MadrigalHecatonImperiosoTurretInit + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2011 Eidolon (Nydus Trinity) (cm\faction-t\eidolon-nydus.grp) +.headerstart +IsId 835 +Type 13 +Init EidolonNydusInit +Death EidolonNydusDeath +GndAttkInit EidolonNydusGndAttkInit +AirAttkInit EidolonNydusGndAttkInit +Unused1 EidolonNydusUnused1 +GndAttkRpt EidolonNydusGndAttkRpt +AirAttkRpt EidolonNydusGndAttkRpt +CastSpell EidolonNydusCastSpell +GndAttkToIdle EidolonNydusGndAttkToIdle +AirAttkToIdle EidolonNydusGndAttkToIdle +Unused2 [NONE] +Walking EidolonNydusWalking +WalkingToIdle EidolonNydusWalkingToIdle +SpecialState1 EidolonNydusSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +EidolonNydusInit: + imgul 2012 0 0 # Eidolon (Nydus) Shadow (terran\tghShad.grp) +EidolonNydusWalkingToIdle: + playfram 0x33 +EidolonNydusLocal00: + wait 63 + randcondjmp 25 EidolonNydusLocal01 + randcondjmp 128 EidolonNydusLocal02 + goto EidolonNydusLocal00 + +EidolonNydusLocal01: + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + randcondjmp 192 EidolonNydusLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto EidolonNydusLocal04 + +EidolonNydusLocal04: + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + goto EidolonNydusWalkingToIdle + +EidolonNydusLocal03: + wait 13 + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + goto EidolonNydusWalkingToIdle + +EidolonNydusLocal02: + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + turnrand 3 + wait 1 + playfram 0x44 + wait 1 + goto EidolonNydusWalkingToIdle + +EidolonNydusDeath: + playsnd 238 # Terran\GHOST\TGhDth00.wav + goto EidolonDeathInit + +EidolonNydusUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1166 # Eidolon revive 01 + playfram 228 + wait 2 + playfram 227 + wait 2 + playfram 226 + wait 2 + playfram 225 + wait 2 + playfram 224 + wait 2 + playfram 223 + wait 2 + playfram 222 + wait 2 + playfram 221 + wait 2 + setfldirect 12 + nobrkcodeend + goto EidolonNydusWalkingToIdle + +EidolonNydusGndAttkInit: + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 +EidolonNydusGndAttkRpt: + wait 1 + nobrkcodestart + attack + playfram 0xcc + wait 1 + playfram 0x22 + nobrkcodeend + gotorepeatattk + ignorerest +EidolonNydusGndAttkToIdle: + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + goto EidolonNydusWalkingToIdle + +EidolonNydusCastSpell: + nobrkcodestart + wait 1 + playsnd 240 # Terran\GHOST\TGhLkd00.wav + castspell + playfram 0xcc + wait 2 + playfram 0x22 + nobrkcodeend + gotorepeatattk + sigorder 2 + goto EidolonNydusGndAttkToIdle + +EidolonNydusWalking: + move 4 + wait 1 + playfram 0x44 + move 4 + wait 1 + playfram 0x55 + move 4 + wait 1 + playfram 0x66 + move 4 + wait 1 + playfram 0x77 + move 4 + wait 1 + playfram 0x88 + move 4 + wait 1 + playfram 0x99 + move 4 + wait 1 + playfram 0xaa + move 4 + wait 1 + playfram 0xbb + move 4 + wait 1 + playfram 0x33 + goto EidolonNydusWalking + +EidolonNydusSpecialState1: + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index aeec9b9..301d666 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 6245bca..3bb777d 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -136,7 +136,7 @@ Generic_Wait1End: # 005 Rilirokor (zerg\brood.grp) .headerstart IsId 4 -Type 12 +Type 26 Init RilirokorInit Death RilirokorDeath GndAttkInit RilirokorGndAttkInit @@ -150,7 +150,21 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking RilirokorWalking WalkingToIdle RilirokorGndAttkToIdle -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 +SpecialState2 SkryrokorLocal00 +AlmostBuilt SkryrokorLocal00 +Built SkryrokorLocal00 +Landing SkryrokorLocal00 +LiftOff SkryrokorLocal00 +IsWorking SkryrokorLocal00 +WorkingToIdle SkryrokorLocal00 +WarpIn SkryrokorLocal00 +Unused3 SkryrokorLocal00 +StarEditInit SkryrokorLocal00 +Disable SkryrokorLocal00 +Burrow SkryrokorLocal00 +UnBurrow SkryrokorLocal00 +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -2335,7 +2349,7 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking ZethrokorWalking WalkingToIdle ZethrokorGndAttkToIdle -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 SpecialState2 ZethrokorSpecialState2 AlmostBuilt [NONE] Built [NONE] @@ -3449,6 +3463,7 @@ SurkithCesiantGndAttkInit: trgtarccondjmp 74 42 SurkithCesiantLocal00 trgtarccondjmp 159 42 SurkithCesiantLocal01 nobrkcodestart + wait 1 playfram 24 wait 1 playfram 25 @@ -3482,11 +3497,11 @@ SurkithCesiantGndAttkInit: playfram 25 wait 1 playfram 24 - wait 1 nobrkcodeend gotorepeatattk ignorerest SurkithCesiantGndAttkToIdle: + wait 1 goto SurkithCesiantIsWorking SurkithCesiantIsWorking: @@ -3500,6 +3515,7 @@ SurkithCesiantIsWorking: SurkithCesiantLocal00: nobrkcodestart + wait 1 playfram 4 wait 1 playfram 5 @@ -3543,6 +3559,7 @@ SurkithCesiantLocal00: SurkithCesiantLocal01: nobrkcodestart + wait 1 playfram 14 wait 1 playfram 15 @@ -7490,6 +7507,7 @@ SkortrithCesiantGndAttkInit: trgtarccondjmp 74 42 SkortrithCesiantLocal00 trgtarccondjmp 159 42 SkortrithCesiantLocal01 nobrkcodestart + wait 1 playfram 24 wait 1 playfram 25 @@ -7523,7 +7541,6 @@ SkortrithCesiantGndAttkInit: playfram 25 wait 1 playfram 24 - wait 1 nobrkcodeend gotorepeatattk ignorerest @@ -7531,6 +7548,7 @@ SkortrithCesiantGndAttkInit: SkortrithCesiantLocal00: nobrkcodestart + wait 1 playfram 4 wait 1 playfram 5 @@ -7574,6 +7592,7 @@ SkortrithCesiantLocal00: SkortrithCesiantLocal01: nobrkcodestart + wait 1 playfram 14 wait 1 playfram 15 @@ -9148,8 +9167,23 @@ ZoryusthalethLocal06: ZoryusthalethDeath: playsnd 1917 # Zoryusthaleth death 01 - imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) - wait 5 + setfldirect 0 + playfram 408 + wait 2 + playfram 409 + wait 2 + playfram 410 + wait 2 + playfram 411 + wait 2 + playfram 412 + wait 2 + playfram 413 + wait 2 + playfram 414 + wait 2 + playfram 415 + wait 2 lowsprul 823 0 0 # Zoryusthaleth Remains wait 1 end @@ -9169,20 +9203,20 @@ ZoryusthalethGndAttkInit: wait 1 nobrkcodestart playsndbtwn 1918 1919 # Zoryusthaleth weaponfire 01, 02 - playfram 0xaa + playfram 0xAA wait 1 - playfram 0xbb + playfram 0xBB wait 1 - playfram 0xcc + playfram 0xCC wait 1 - playfram 0xdd + playfram 0xDD attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV wait 1 - playfram 0xcc + playfram 0xEE wait 1 - playfram 0xbb + playfram 0xFF wait 1 - playfram 0xaa + playfram 0x110 nobrkcodeend gotorepeatattk goto ZoryusthalethGndAttkToIdle @@ -9206,25 +9240,31 @@ ZoryusthalethCastSpell: ZoryusthalethWalking: move 5 - wait 1 + wait 1 + playfram 0x11 + move 5 + wait 1 + playfram 0x22 + move 5 + wait 1 playfram 0x33 - move 5 - wait 1 - playfram 0x44 - move 5 - wait 1 - playfram 0x55 move 5 - wait 1 + wait 1 + playfram 0x44 + move 5 + wait 1 + playfram 0x55 + move 5 + wait 1 playfram 0x66 move 5 - wait 1 + wait 1 playfram 0x77 - move 5 - wait 1 + move 5 + wait 1 playfram 0x88 move 5 - wait 1 + wait 1 playfram 0x99 goto ZoryusthalethWalking @@ -9235,23 +9275,23 @@ ZoryusthalethSpecialState2: ZoryusthalethBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) - playfram 0xee - wait 1 - playfram 0xff - wait 1 - playfram 0x110 - wait 1 playfram 0x121 wait 1 playfram 0x132 - imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) - imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) - imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) wait 1 playfram 0x143 wait 1 playfram 0x154 wait 1 + playfram 0x165 + imgol 423 15 12 # Burrowing Dust (thingy\bDust.grp) + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -3 # Burrowing Dust (thingy\bDust.grp) + wait 1 + playfram 0x176 + wait 1 + playfram 0x187 + wait 1 sigorder 4 goto SkryrokorLocal00 @@ -9260,20 +9300,20 @@ ZoryusthalethUnBurrow: waitrand 1 2 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) imgol 423 12 -9 # Burrowing Dust (thingy\bDust.grp) + playfram 0x176 + wait 1 + playfram 0x165 + wait 1 + playfram 0x154 + wait 1 playfram 0x143 + imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) + imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) wait 1 playfram 0x132 wait 1 playfram 0x121 wait 1 - playfram 0x110 - imgol 423 12 -15 # Burrowing Dust (thingy\bDust.grp) - imgol 423 -12 -12 # Burrowing Dust (thingy\bDust.grp) - wait 1 - playfram 0xff - wait 1 - playfram 0xee - wait 1 sigorder 4 goto ZoryusthalethGndAttkToIdle @@ -9849,24 +9889,9 @@ KonviliskLocal06: KonviliskDeath: playsndbtwn 925 927 # Zerg\Queen\ZQuDth00.WAV | Zerg\Queen\ZQuDth02.WAV sprol 156 0 0 # Matraleth Death (zerg\zquDeath.grp) - playfram 204 - wait 1 - playfram 205 - wait 1 - playfram 206 - wait 1 - playfram 207 - wait 1 - playfram 208 - wait 1 - playfram 209 - wait 1 - playfram 210 - wait 1 - playfram 211 - wait 5 + wait 3 lowsprul 689 0 0 # Konvilisk Remnants (cm\zerg\konvilisk-death.grp) - wait 1 + wait 1 end KonviliskUnused1: @@ -15854,7 +15879,14 @@ LakiziliskDeath: playfram 0x1ed wait 2 lowsprul 484 0 0 # Lakizilisk Remnants (zerg\zLakizilisk.grp) - wait 9 # Extra time to prevent nullsprite crash + tmprmgraphicstart +LakiziliskDeathLoop: + unused_0c + wait 1 + goto LakiziliskDeathLoop + +LakiziliskDeathEnd: + wait 1 end LakiziliskUnused1: diff --git a/mpq/sound/cm/p/_building/bulwark/proc-01.wav b/mpq/sound/cm/p/_building/bulwark/proc-01.wav new file mode 100644 index 0000000..a5f8c5c Binary files /dev/null and b/mpq/sound/cm/p/_building/bulwark/proc-01.wav differ diff --git a/mpq/sound/cm/p/_building/bulwark/proc-02.wav b/mpq/sound/cm/p/_building/bulwark/proc-02.wav new file mode 100644 index 0000000..6bcc608 Binary files /dev/null and b/mpq/sound/cm/p/_building/bulwark/proc-02.wav differ diff --git a/mpq/sound/cm/p/_building/bulwark/proc-03.wav b/mpq/sound/cm/p/_building/bulwark/proc-03.wav new file mode 100644 index 0000000..04df347 Binary files /dev/null and b/mpq/sound/cm/p/_building/bulwark/proc-03.wav differ diff --git a/mpq/sound/cm/p/_building/crucible/amb-01.wav b/mpq/sound/cm/p/_building/crucible/amb-01.wav new file mode 100644 index 0000000..3f96e2b Binary files /dev/null and b/mpq/sound/cm/p/_building/crucible/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/crucible.wav b/mpq/sound/cm/p/_building/crucible/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/crucible.wav rename to mpq/sound/cm/p/_building/crucible/wht-01.wav diff --git a/mpq/sound/cm/p/_building/embassy/amb-01.wav b/mpq/sound/cm/p/_building/embassy/amb-01.wav new file mode 100644 index 0000000..515c4e1 Binary files /dev/null and b/mpq/sound/cm/p/_building/embassy/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/gateway/amb-01.wav b/mpq/sound/cm/p/_building/gateway/amb-01.wav new file mode 100644 index 0000000..81b6fa1 Binary files /dev/null and b/mpq/sound/cm/p/_building/gateway/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/lattice/amb-01.wav b/mpq/sound/cm/p/_building/lattice/amb-01.wav new file mode 100644 index 0000000..be34ed8 Binary files /dev/null and b/mpq/sound/cm/p/_building/lattice/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/nexus/amb-01.wav b/mpq/sound/cm/p/_building/nexus/amb-01.wav new file mode 100644 index 0000000..fe38cff Binary files /dev/null and b/mpq/sound/cm/p/_building/nexus/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/stargate/amb-01.wav b/mpq/sound/cm/p/_building/stargate/amb-01.wav new file mode 100644 index 0000000..2f6cdb9 Binary files /dev/null and b/mpq/sound/cm/p/_building/stargate/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/stargate.wav b/mpq/sound/cm/p/_building/stargate/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/_building/stargate.wav rename to mpq/sound/cm/p/_building/stargate/wht-01.wav diff --git a/mpq/sound/cm/t/_building/bunker.wav b/mpq/sound/cm/t/_building/anchor.wav similarity index 100% rename from mpq/sound/cm/t/_building/bunker.wav rename to mpq/sound/cm/t/_building/anchor.wav diff --git a/mpq/sound/cm/t/_building/biotic-base.wav b/mpq/sound/cm/t/_building/biotic-bastion.wav similarity index 100% rename from mpq/sound/cm/t/_building/biotic-base.wav rename to mpq/sound/cm/t/_building/biotic-bastion.wav diff --git a/mpq/sound/cm/t/_building/facade-cast-01.wav b/mpq/sound/cm/t/_building/facade/cast-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/facade-cast-01.wav rename to mpq/sound/cm/t/_building/facade/cast-01.wav diff --git a/mpq/sound/cm/t/_building/facade-off-01.wav b/mpq/sound/cm/t/_building/facade/off-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/facade-off-01.wav rename to mpq/sound/cm/t/_building/facade/off-01.wav diff --git a/mpq/sound/cm/t/_building/facade.WAV b/mpq/sound/cm/t/_building/facade/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/facade.WAV rename to mpq/sound/cm/t/_building/facade/wht-01.wav diff --git a/mpq/sound/cm/t/_building/fulcrum/amb-01.wav b/mpq/sound/cm/t/_building/fulcrum/amb-01.wav new file mode 100644 index 0000000..2efc08d Binary files /dev/null and b/mpq/sound/cm/t/_building/fulcrum/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/fulcrum.wav b/mpq/sound/cm/t/_building/fulcrum/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/fulcrum.wav rename to mpq/sound/cm/t/_building/fulcrum/wht-01.wav diff --git a/mpq/sound/cm/t/_building/ministry/amb-01.wav b/mpq/sound/cm/t/_building/ministry/amb-01.wav new file mode 100644 index 0000000..7eaed63 Binary files /dev/null and b/mpq/sound/cm/t/_building/ministry/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/ministry.wav b/mpq/sound/cm/t/_building/ministry/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/ministry.wav rename to mpq/sound/cm/t/_building/ministry/wht-01.wav diff --git a/mpq/sound/cm/t/_building/munitions-bay.wav b/mpq/sound/cm/t/_building/rotary.wav similarity index 100% rename from mpq/sound/cm/t/_building/munitions-bay.wav rename to mpq/sound/cm/t/_building/rotary.wav diff --git a/mpq/sound/cm/t/_building/starpad/amb-01.wav b/mpq/sound/cm/t/_building/starpad/amb-01.wav new file mode 100644 index 0000000..fef8c1c Binary files /dev/null and b/mpq/sound/cm/t/_building/starpad/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/starpad.wav b/mpq/sound/cm/t/_building/starpad/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/starpad.wav rename to mpq/sound/cm/t/_building/starpad/wht-01.wav diff --git a/mpq/sound/cm/t/_building/stockade/amb-01.wav b/mpq/sound/cm/t/_building/stockade/amb-01.wav new file mode 100644 index 0000000..9e6aa5d Binary files /dev/null and b/mpq/sound/cm/t/_building/stockade/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/barracks.wav b/mpq/sound/cm/t/_building/stockade/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/barracks.wav rename to mpq/sound/cm/t/_building/stockade/wht-01.wav diff --git a/mpq/sound/cm/t/_building/treasury/amb-01.wav b/mpq/sound/cm/t/_building/treasury/amb-01.wav new file mode 100644 index 0000000..faba306 Binary files /dev/null and b/mpq/sound/cm/t/_building/treasury/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/treasury.wav b/mpq/sound/cm/t/_building/treasury/wht-01.wav similarity index 100% rename from mpq/sound/cm/t/_building/treasury.wav rename to mpq/sound/cm/t/_building/treasury/wht-01.wav diff --git a/mpq/sound/cm/t/eidolon/wf-01.wav b/mpq/sound/cm/t/eidolon/wf-01.wav new file mode 100644 index 0000000..f8dd485 Binary files /dev/null and b/mpq/sound/cm/t/eidolon/wf-01.wav differ diff --git a/mpq/sound/cm/t/eidolon/wf-02.wav b/mpq/sound/cm/t/eidolon/wf-02.wav new file mode 100644 index 0000000..6fd8375 Binary files /dev/null and b/mpq/sound/cm/t/eidolon/wf-02.wav differ diff --git a/mpq/sound/cm/t/eidolon/wf-03.wav b/mpq/sound/cm/t/eidolon/wf-03.wav new file mode 100644 index 0000000..5aa58e7 Binary files /dev/null and b/mpq/sound/cm/t/eidolon/wf-03.wav differ diff --git a/mpq/sound/cm/t/eidolon/windup-01.wav b/mpq/sound/cm/t/eidolon/windup-01.wav new file mode 100644 index 0000000..0065a80 Binary files /dev/null and b/mpq/sound/cm/t/eidolon/windup-01.wav differ diff --git a/mpq/sound/cm/t/eidolon/windup-02.wav b/mpq/sound/cm/t/eidolon/windup-02.wav new file mode 100644 index 0000000..09fe037 Binary files /dev/null and b/mpq/sound/cm/t/eidolon/windup-02.wav differ diff --git a/mpq/sound/cm/t/eidolon/windup-03.wav b/mpq/sound/cm/t/eidolon/windup-03.wav new file mode 100644 index 0000000..1626788 Binary files /dev/null and b/mpq/sound/cm/t/eidolon/windup-03.wav differ diff --git a/mpq/sound/cm/z/egg/amb-01.wav b/mpq/sound/cm/z/egg/amb-01.wav new file mode 100644 index 0000000..a0261c8 Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-01.wav differ diff --git a/mpq/sound/cm/z/egg/amb-02.wav b/mpq/sound/cm/z/egg/amb-02.wav new file mode 100644 index 0000000..445ef45 Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-02.wav differ diff --git a/mpq/sound/cm/z/egg/amb-03.wav b/mpq/sound/cm/z/egg/amb-03.wav new file mode 100644 index 0000000..428befe Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-03.wav differ diff --git a/mpq/sound/cm/z/egg/amb-04.wav b/mpq/sound/cm/z/egg/amb-04.wav new file mode 100644 index 0000000..520164c Binary files /dev/null and b/mpq/sound/cm/z/egg/amb-04.wav differ diff --git a/mpq/templates/Competitive(1).got b/mpq/templates/Competitive(1).got deleted file mode 100644 index cf45e2f..0000000 Binary files a/mpq/templates/Competitive(1).got and /dev/null differ diff --git a/mpq/templates/Ranked(1).got b/mpq/templates/Ranked(1).got new file mode 100644 index 0000000..090c0ec Binary files /dev/null and b/mpq/templates/Ranked(1).got differ diff --git a/mpq/templates/Unranked(1).got b/mpq/templates/Unranked(1).got new file mode 100644 index 0000000..5e4d0be Binary files /dev/null and b/mpq/templates/Unranked(1).got differ diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst index 952b5bb..47fb997 100644 --- a/mpq/templates/templates.lst +++ b/mpq/templates/templates.lst @@ -1,4 +1,4 @@ -"Competitive(1).got" +"Unranked(1).got" "Scenario(1).got" "Omnipresence(1).got" "Faction Wars(1).got" diff --git a/mpq/tileset/Jungle.cv5 b/mpq/tileset/Jungle.cv5 index e76e76c..f6fbccb 100644 Binary files a/mpq/tileset/Jungle.cv5 and b/mpq/tileset/Jungle.cv5 differ diff --git a/mpq/tileset/Jungle.vf4 b/mpq/tileset/Jungle.vf4 index 1ed1cc8..08d972d 100644 Binary files a/mpq/tileset/Jungle.vf4 and b/mpq/tileset/Jungle.vf4 differ diff --git a/mpq/tileset/Jungle.vx4ex b/mpq/tileset/Jungle.vx4ex index affc680..f32ca28 100644 Binary files a/mpq/tileset/Jungle.vx4ex and b/mpq/tileset/Jungle.vx4ex differ diff --git a/mpq/tileset/platform.vf4 b/mpq/tileset/platform.vf4 index 78727b0..3adf1ad 100644 Binary files a/mpq/tileset/platform.vf4 and b/mpq/tileset/platform.vf4 differ diff --git a/mpq/tileset/twilight.cv5 b/mpq/tileset/twilight.cv5 index 4d65477..c1870d1 100644 Binary files a/mpq/tileset/twilight.cv5 and b/mpq/tileset/twilight.cv5 differ diff --git a/mpq/tileset/twilight.vf4 b/mpq/tileset/twilight.vf4 index 587f00a..7d92f4e 100644 Binary files a/mpq/tileset/twilight.vf4 and b/mpq/tileset/twilight.vf4 differ diff --git a/mpq/tileset/twilight.vr4 b/mpq/tileset/twilight.vr4 index 79646a3..5929152 100644 Binary files a/mpq/tileset/twilight.vr4 and b/mpq/tileset/twilight.vr4 differ diff --git a/mpq/tileset/twilight.vx4ex b/mpq/tileset/twilight.vx4ex index e965007..a526932 100644 Binary files a/mpq/tileset/twilight.vx4ex and b/mpq/tileset/twilight.vx4ex differ diff --git a/mpq/unit/cm/askosi/pilgrim-shadow.grp b/mpq/unit/cm/askosi/pilgrim-shadow.grp index 2c1a0d4..4ea1958 100644 Binary files a/mpq/unit/cm/askosi/pilgrim-shadow.grp and b/mpq/unit/cm/askosi/pilgrim-shadow.grp differ diff --git a/mpq/unit/cm/askosi/pilgrim.grp b/mpq/unit/cm/askosi/pilgrim.grp index d45d67a..c1f0005 100644 Binary files a/mpq/unit/cm/askosi/pilgrim.grp and b/mpq/unit/cm/askosi/pilgrim.grp differ diff --git a/mpq/unit/cm/askosi/pilgrim.loo b/mpq/unit/cm/askosi/pilgrim.loo new file mode 100644 index 0000000..9f16a5f Binary files /dev/null and b/mpq/unit/cm/askosi/pilgrim.loo differ diff --git a/mpq/unit/cm/askosi/rove.grp b/mpq/unit/cm/askosi/rove.grp new file mode 100644 index 0000000..74b7462 Binary files /dev/null and b/mpq/unit/cm/askosi/rove.grp differ diff --git a/mpq/unit/cm/faction-t/madrigal-hecaton-base.grp b/mpq/unit/cm/faction-t/madrigal-hecaton-base.grp new file mode 100644 index 0000000..ef3ef22 Binary files /dev/null and b/mpq/unit/cm/faction-t/madrigal-hecaton-base.grp differ diff --git a/mpq/unit/cm/faction-t/madrigal-hecaton-turret.grp b/mpq/unit/cm/faction-t/madrigal-hecaton-turret.grp new file mode 100644 index 0000000..14c5a0e Binary files /dev/null and b/mpq/unit/cm/faction-t/madrigal-hecaton-turret.grp differ diff --git a/mpq/unit/cm/faction-t/tartarus-mine-shadow.grp b/mpq/unit/cm/faction-t/tartarus-mine-shadow.grp new file mode 100644 index 0000000..1298828 Binary files /dev/null and b/mpq/unit/cm/faction-t/tartarus-mine-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/tartarus-mine.grp b/mpq/unit/cm/faction-t/tartarus-mine.grp new file mode 100644 index 0000000..974b0d7 Binary files /dev/null and b/mpq/unit/cm/faction-t/tartarus-mine.grp differ diff --git a/mpq/unit/cm/faction-t/vulture-hecaton.grp b/mpq/unit/cm/faction-t/vulture-hecaton.grp new file mode 100644 index 0000000..71e3c24 Binary files /dev/null and b/mpq/unit/cm/faction-t/vulture-hecaton.grp differ diff --git a/mpq/unit/cm/protoss/architect-engine.grp b/mpq/unit/cm/protoss/architect-engine.grp index 086057f..aa711f5 100644 Binary files a/mpq/unit/cm/protoss/architect-engine.grp and b/mpq/unit/cm/protoss/architect-engine.grp differ diff --git a/mpq/unit/cm/protoss/architect.grp b/mpq/unit/cm/protoss/architect.grp index a8edc58..725b63d 100644 Binary files a/mpq/unit/cm/protoss/architect.grp and b/mpq/unit/cm/protoss/architect.grp differ diff --git a/mpq/unit/cm/protoss/artisan.grp b/mpq/unit/cm/protoss/artisan.grp index 7b2a9a5..df1f918 100644 Binary files a/mpq/unit/cm/protoss/artisan.grp and b/mpq/unit/cm/protoss/artisan.grp differ diff --git a/mpq/unit/cm/protoss/artisan.loo b/mpq/unit/cm/protoss/artisan.loo index 4177029..5506fe1 100644 Binary files a/mpq/unit/cm/protoss/artisan.loo and b/mpq/unit/cm/protoss/artisan.loo differ diff --git a/mpq/unit/cm/protoss/legionnaire-shadow.grp b/mpq/unit/cm/protoss/legionnaire-shadow.grp index d3d5033..b41e031 100644 Binary files a/mpq/unit/cm/protoss/legionnaire-shadow.grp and b/mpq/unit/cm/protoss/legionnaire-shadow.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire.grp b/mpq/unit/cm/protoss/legionnaire.grp index e5116e2..adc18fa 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/terran/burst-lasers-hit-cyan.grp b/mpq/unit/cm/terran/burst-lasers-hit-cyan.grp new file mode 100644 index 0000000..ac8ae7a Binary files /dev/null and b/mpq/unit/cm/terran/burst-lasers-hit-cyan.grp differ diff --git a/mpq/unit/cm/terran/burst-lasers-hit-green.grp b/mpq/unit/cm/terran/burst-lasers-hit-green.grp new file mode 100644 index 0000000..8470dd8 Binary files /dev/null and b/mpq/unit/cm/terran/burst-lasers-hit-green.grp differ diff --git a/mpq/unit/cm/terran/madrigal-base.grp b/mpq/unit/cm/terran/madrigal-base.grp index 8698727..aee3661 100644 Binary files a/mpq/unit/cm/terran/madrigal-base.grp and b/mpq/unit/cm/terran/madrigal-base.grp differ diff --git a/mpq/unit/cm/terran/madrigal-turret.grp b/mpq/unit/cm/terran/madrigal-turret.grp index 737fc82..df3844b 100644 Binary files a/mpq/unit/cm/terran/madrigal-turret.grp and b/mpq/unit/cm/terran/madrigal-turret.grp differ diff --git a/mpq/unit/cm/terran/matador-shadow.grp b/mpq/unit/cm/terran/matador-shadow.grp index 67d28a0..f71385c 100644 Binary files a/mpq/unit/cm/terran/matador-shadow.grp and b/mpq/unit/cm/terran/matador-shadow.grp differ diff --git a/mpq/unit/cm/terran/matador-turret.grp b/mpq/unit/cm/terran/matador-turret.grp index fa63c36..fbad451 100644 Binary files a/mpq/unit/cm/terran/matador-turret.grp and b/mpq/unit/cm/terran/matador-turret.grp differ diff --git a/mpq/unit/cm/terran/matador-turret.lol b/mpq/unit/cm/terran/matador-turret.lol index feb23cb..eb157d1 100644 Binary files a/mpq/unit/cm/terran/matador-turret.lol and b/mpq/unit/cm/terran/matador-turret.lol differ diff --git a/mpq/unit/cm/terran/matador.grp b/mpq/unit/cm/terran/matador.grp index 537b165..a35a6d1 100644 Binary files a/mpq/unit/cm/terran/matador.grp and b/mpq/unit/cm/terran/matador.grp differ diff --git a/mpq/unit/cm/terran/wraith-death.grp b/mpq/unit/cm/terran/wraith-death.grp new file mode 100644 index 0000000..53f8e73 Binary files /dev/null and b/mpq/unit/cm/terran/wraith-death.grp differ diff --git a/mpq/unit/cm/zerg/izirokor-birth.grp b/mpq/unit/cm/zerg/izirokor-birth.grp index 661bf16..9cb7eda 100644 Binary files a/mpq/unit/cm/zerg/izirokor-birth.grp and b/mpq/unit/cm/zerg/izirokor-birth.grp differ diff --git a/mpq/unit/cm/zerg/izirokor-mutate.grp b/mpq/unit/cm/zerg/izirokor-mutate.grp index 5fdce8f..8361d03 100644 Binary files a/mpq/unit/cm/zerg/izirokor-mutate.grp and b/mpq/unit/cm/zerg/izirokor-mutate.grp differ diff --git a/mpq/unit/cm/zerg/izirokor-remains.grp b/mpq/unit/cm/zerg/izirokor-remains.grp index 6094d29..c507cca 100644 Binary files a/mpq/unit/cm/zerg/izirokor-remains.grp and b/mpq/unit/cm/zerg/izirokor-remains.grp differ diff --git a/mpq/unit/cm/zerg/izirokor-shadow.grp b/mpq/unit/cm/zerg/izirokor-shadow.grp index 2cb5f95..7ada362 100644 Binary files a/mpq/unit/cm/zerg/izirokor-shadow.grp and b/mpq/unit/cm/zerg/izirokor-shadow.grp differ diff --git a/mpq/unit/cm/zerg/izirokor.grp b/mpq/unit/cm/zerg/izirokor.grp index a0371b6..c4aa203 100644 Binary files a/mpq/unit/cm/zerg/izirokor.grp and b/mpq/unit/cm/zerg/izirokor.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth-birth.grp b/mpq/unit/cm/zerg/zoryusthaleth-birth.grp index aef9da6..a067c4e 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth-birth.grp and b/mpq/unit/cm/zerg/zoryusthaleth-birth.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp b/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp new file mode 100644 index 0000000..41eb35b Binary files /dev/null and b/mpq/unit/cm/zerg/zoryusthaleth-mutate.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth-remains.grp b/mpq/unit/cm/zerg/zoryusthaleth-remains.grp index 84ca940..22f8746 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth-remains.grp and b/mpq/unit/cm/zerg/zoryusthaleth-remains.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp index bcd2878..693928c 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp and b/mpq/unit/cm/zerg/zoryusthaleth-shadow.grp differ diff --git a/mpq/unit/cm/zerg/zoryusthaleth.grp b/mpq/unit/cm/zerg/zoryusthaleth.grp index 419cf73..4f546b2 100644 Binary files a/mpq/unit/cm/zerg/zoryusthaleth.grp and b/mpq/unit/cm/zerg/zoryusthaleth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 950b40f..90535fd 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 a3a6397..e13caea 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 9a0f5a9..a50529f 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 019edb8..3d3f563 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 31d48d7..6588e39 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ