diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 50e89b7b..3a3f6252 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 6b6a677b..989b7a73 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -119,7 +119,7 @@ Vespene Geyser Mineral Field Type1 Mineral Field Type2 Mineral Field Type3 -Aerie +Facade Zerg Beacon Terran Beacon Protoss Beacon @@ -215,7 +215,7 @@ Iroleth Matrix Paladin Madrigal -Savant +Savant (Entropy Gauntlets) Scrapyard Rotary Sundog @@ -547,10 +547,10 @@ Renesair Unar Ashguard Xenolith -Extended Flingy #341 -Extended Flingy #342 -Extended Flingy #343 -Extended Flingy #344 +Savant (Power Siphon) +Landlock +Quazrokor +Dracadin (Order) Extended Flingy #345 Extended Flingy #346 Extended Flingy #347 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index e966fff7..57327b7f 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 3e62e1c9..f488b223 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 491e0fed..3fe6caf4 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -351,7 +351,7 @@ Mineral Field Type2 Mineral Field Type2 Shadow Mineral Field Type3 Mineral Field Type3 Shadow -Aerie +Facade Zerg Beacon Zerg Beacon Overlay Terran Beacon @@ -1005,7 +1005,7 @@ Iroleth Matrix Paladin Madrigal Base (Imperioso) -Savant +Savant (Entropy Gauntlets) Scrapyard Rotary Matrix Shadow @@ -1071,8 +1071,8 @@ Malediction Overlay Large Rotary Shadow Simulacrum Simulacrum Shadow -unused -Savant Shadow +Savant (Power Siphon) +Savant Shadow (Power Siphon) Ancile Ancile Shadow Ancile Engines @@ -1131,7 +1131,7 @@ Crucible Crucible Shadow Crucible Warpin Wyvern Shadow -Aerie Shadow +Facade Shadow Oberon Gladius Gladius Shadow @@ -1995,14 +1995,14 @@ Xenolith Warp Flash Zobriolisk Burrow Weaponfire Lakizilisk Mutate Zobriolisk Birth -Extended Image #995 -Extended Image #996 -Extended Image #997 -Extended Image #998 -Extended Image #999 -Extended Image #1000 -Extended Image #1001 -Extended Image #1002 +Landlock +Landlock Shadow +Quazrokor +Quazrokor Shadow +Dracadin (Order) +Dracadin Shadow (Order) +Dracadin Remains (Order) +Savant Shadow (Entropy Gauntlets) Extended Image #1003 Extended Image #1004 Extended Image #1005 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index f540ff1b..6b69c213 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 60aec190..99a0b7af 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3444,9 +3444,9 @@ Aspirant Under Attack 01 Aspirant Under Attack 02 Aspirant Under Attack 03 Aspirant Under Attack 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Quazrokor Weaponfire 01 +Quazrokor Weaponfire 02 +Quazrokor Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 34d7fcff..76d88949 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3443,4 +3443,7 @@ cm\f-t\aspirant\agg-04.wav cm\f-t\aspirant\hlp-01.wav cm\f-t\aspirant\hlp-02.wav cm\f-t\aspirant\hlp-03.wav -cm\f-t\aspirant\hlp-04.wav \ No newline at end of file +cm\f-t\aspirant\hlp-04.wav +cm\f-z\quazrokor\wf-01.wav +cm\f-z\quazrokor\wf-02.wav +cm\f-z\quazrokor\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 3c228dfd..72ddc6a0 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 cfddab65..f9a78802 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -280,7 +280,7 @@ Bengalaas (Jungle) Mineral Field Type1 Mineral Field Type2 Mineral Field Type3 -Aerie +Facade Zerg Beacon Terran Beacon Protoss Beacon @@ -522,7 +522,7 @@ Iroleth Sundog Paladin Madrigal -Savant +Savant (Entropy Gauntlets) Scrapyard Rotary Wyvern @@ -976,11 +976,11 @@ Unar Unar Orbital Ashguard Xenolith -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Savant (Power Siphon) +Landlock +Quazrokor +Dracadin (Order) +Dracadin Remains (Order) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 3a23cb12..1ea6da54 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 0d581385..8a467865 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -25,7 +25,7 @@ Archon Warp (unused) Savant Onhit Toggle Disruption Field (Lanifect) Rescind Control (Mind Tyrant) -Tyranny (Mind Tyrant) +Maledictus (Mind Tyrant) Select Control (Larva) Grief of All Gods (Star Sovereign) Aural Assault (Luminary) diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index cd9a85e5..e22c8232 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 ed2ad146..77894c40 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -185,7 +185,7 @@ Protoss Empress Protoss Prudence Zerg Skithrokor Terran Paladin -Terran Savant +Terran Savant (Entropy Gauntlets) Vespene Geyser Terran Hadron Terran Biotic Bastion @@ -257,11 +257,11 @@ Terran Ancile Terran Matador (Tank Mode) Terran Future Station Zerg Zarcavrokor -Terran Quantum Institute -Terran Aerie -Terran Pegasus +Terran Quantum Institute (unused) +Terran Aerie (unused) +Terran Pegasus (unused) Terran Hippogriff -Terran Oberon +Terran Oberon (unused) Terran Aion Protoss Herald Protoss Epigraph @@ -425,10 +425,10 @@ Protoss Renesair Protoss Ashguard Zerg Lakizilisk (Zorthos) Protoss Xenolith -Extended Unit #200 -Extended Unit #201 -Extended Unit #202 -Extended Unit #203 +Terran Facade +Terran Savant (Power Siphon) +Askosi Landlock +Protoss Dracadin (Order) Extended Unit #204 Extended Unit #205 Extended Unit #206 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index fcacc066..2b0fbf57 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 ead7ace0..bc86e711 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -86,7 +86,7 @@ Psionic Storm (Cantavis ability) Hollowed Glaves (Liiralisk) Phase Spear (Legionnaire) Harrying Talons (Akistrokor) -Discoid Railgun (Savant) +Discoid Railgun (Savant Siphon) Electromagnetic Explosion (Lobotomy Mine) Celestial Cannons (Star Sovereign) Intervention Missiles (Star Sovereign behavior) @@ -197,7 +197,7 @@ Sparring Saber (Sycophant) Kissing Emoji (Smoochie Boy) Khaydarin Plasma Laser (Engram) Ion Cannon (Diadem) -Discoid Railgun (Savant, Piercing) +Discoid Railgun (Savant Entropy) Geometric Rifle (Sevenstep, Piercing) Twinstrike Cannons (Matador) Cylindrical Blaster (Analogue) @@ -230,8 +230,8 @@ Autonomous Ray (Unar) Phase Cremator (Ashguard) Successive Spines (Lakizilisk, Zorthos) Rapid Spines (Zobriolisk A) -Extended Weapon #103 -Extended Weapon #104 +Quazrok Spray (Quazrokor) +Phase Disruptor (Dracadin) Extended Weapon #105 Extended Weapon #106 Extended Weapon #107 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index d37692aa..a63367a6 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index b72914b2..9a6fb87a 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 4d665691..11e0be78 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 e3bea40d..ebb3fdd8 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/game/tminimap.pcx b/mpq/game/tminimap.pcx index f24ec248..0e09938e 100644 Binary files a/mpq/game/tminimap.pcx and b/mpq/game/tminimap.pcx differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 28bd28ac..37cf7894 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/tips.tbl b/mpq/rez/tips.tbl index 320869f6..5e4766c2 100644 Binary files a/mpq/rez/tips.tbl and b/mpq/rez/tips.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index a2b1fc8b..845ef40f 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 130eaaa6..833dfd82 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -41,6 +41,7 @@ unit_morph_prerequisites = Add(ovileth, iroleth, 1) unit_morph_prerequisites = Add(othstoleth, alaszileth, 1) unit_morph_prerequisites = Add(zethrokor, vorvrokor, 1) unit_morph_prerequisites = Add(quazilisk, liiralisk, 1) +unit_morph_prerequisites = Add(quazrokor, liiralisk, 1) unit_morph_prerequisites = Add(nathrokor, kalkalisk, 1) unit_morph_prerequisites = Add(nathrelisk, kalkalisk, 1) unit_morph_prerequisites = Add(cikralisk, ghitorokor, 1) @@ -88,6 +89,7 @@ morph_train_ai = Add(ovileth, iroleth) morph_train_ai = Add(othstoleth, alaszileth) morph_train_ai = Add(zethrokor, vorvrokor) morph_train_ai = Add(quazilisk, liiralisk) +morph_train_ai = Add(quazrokor, liiralisk) morph_train_ai = Add(nathrokor, kalkalisk) morph_train_ai = Add(nathrelisk, kalkalisk) morph_train_ai = Add(cikralisk, ghitorokor) diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 142d5c09..37938062 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -57,6 +57,7 @@ military ecclesiast_khalendric = 412 military cicatus = 414 military renesair = 423 military ashguard = 424 +military dracadin_order = 430 # Zerg factional units military nathrelisk = 402 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 1d3deeaa..5209618d 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 9c270877..a22a3f86 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -10509,7 +10509,7 @@ DarkTemplar_Hero_Walking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 122 Dracadin (protoss\dragoon.grp) +# 122 Dracadin (protoss\dracadin.grp) .headerstart IsId 153 Type 21 @@ -10539,7 +10539,7 @@ WarpIn DracadinWarpIn # ----------------------------------------------------------------------------- # DracadinInit: - imgul 123 0 0 # Dracadin Shadow (protoss\pdrShad.grp) + imgul 123 0 0 # Dracadin Shadow (protoss\dracadin-shadow.grp) DracadinWalkingToIdle: playfram 0x00 wait 1 @@ -11101,16 +11101,16 @@ AccantorGndAttkToIdle: goto AccantorWalkingToIdle AccantorWalking: - move 0 + move 2 wait 1 playfram 0x11 - move 0 + move 2 wait 1 playfram 0x22 - move 1 + move 2 wait 1 playfram 0x33 - move 1 + move 2 wait 1 playfram 0x44 move 2 @@ -11119,13 +11119,13 @@ AccantorWalking: move 2 wait 1 playfram 0x66 - move 3 + move 2 wait 1 playfram 0x77 - move 1 + move 2 wait 1 playfram 0x88 - move 6 + move 2 wait 1 playfram 0x00 goto AccantorWalking @@ -24598,163 +24598,76 @@ RotaryDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1007 Savant (cm\terran\savant.grp) +# 1007 Savant Power Siphon (cm\terran\savant-power-siphon.grp) +.headerstart +IsId 815 +Type 14 +Init SavantPowerSiphonInit +Death MadcapDeath +GndAttkInit MadcapGndAttkInit +AirAttkInit MadcapGndAttkInit +Unused1 [NONE] +GndAttkRpt MadcapGndAttkRpt +AirAttkRpt MadcapGndAttkRpt +CastSpell [NONE] +GndAttkToIdle MadcapGndAttkToIdle +AirAttkToIdle MadcapGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 SavantSpecialState1 +SpecialState2 SavantEntropyGauntletsTransform +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SavantPowerSiphonInit: + imgul 1074 0 0 # Savant Power Siphon Shadow (cm\terran\savant-siphon-shadow.grp) + imgol 1110 0 0 # Savant Power Siphon transform + playsnd 3078 # Savant Entropy Gauntlets transform 01 + wait 12 + sigorder 1 + goto MadcapWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1007 Savant (cm\terran\savant-entropy-gauntlets.grp) .headerstart IsId 442 -Type 13 +Type 14 Init SavantInit -Death SavantDeath -GndAttkInit SavantGndAttkInit -AirAttkInit SavantGndAttkInit -Unused1 SavantUnused1 -GndAttkRpt SavantGndAttkRpt -AirAttkRpt SavantGndAttkRpt +Death MadcapDeath +GndAttkInit MadcapGndAttkInit +AirAttkInit MadcapGndAttkInit +Unused1 [NONE] +GndAttkRpt MadcapGndAttkRpt +AirAttkRpt MadcapGndAttkRpt CastSpell [NONE] -GndAttkToIdle SavantGndAttkToIdle -AirAttkToIdle SavantGndAttkToIdle +GndAttkToIdle MadcapGndAttkToIdle +AirAttkToIdle MadcapGndAttkToIdle Unused2 [NONE] -Walking SavantWalking -WalkingToIdle SavantWalkingToIdle -SpecialState1 SavantSpecialState1 +Walking MadcapWalking +WalkingToIdle MadcapWalkingToIdle +SpecialState1 SavantEntropyGauntletsTransform +SpecialState2 SavantEntropyGauntletsTransform +AlmostBuilt [NONE] .headerend # ----------------------------------------------------------------------------- # SavantInit: - imgul 1074 0 -5 # Savant Shadow (cm\terran\savant-shadow.grp) -SavantWalkingToIdle: - playfram 0x00 -SavantLocal00: - wait 62 - randcondjmp 25 SavantLocal01 - randcondjmp 128 SavantLocal01 - goto SavantLocal00 - -SavantLocal01: - playfram 0x00 - wait 1 - playfram 0x11 - wait 1 - playfram 0x22 - randcondjmp 192 SavantLocal03 - 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 SavantLocal04 - -SavantLocal04: - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - goto SavantWalkingToIdle - -SavantLocal03: - wait 13 - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - goto SavantWalkingToIdle - -SavantDeath: - playsnd 238 # Terran\Ghost\TGhDth00.wav - setfldirect 0 - playfram 0x00 - imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) - wait 2 - lowsprul 950 0 0 # Savant remains - wait 1 - end - -SavantUnused1: - wait 1 - nobrkcodestart - playsndbtwn 1166 1167 - setfldirect 0 - playfram 0x00 - imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) - wait 6 - nobrkcodeend - goto SavantWalkingToIdle - -SavantGndAttkInit: - playfram 0x99 - wait 1 -SavantGndAttkRpt: - wait 1 - nobrkcodestart - attack - playfram 0xaa - wait 1 - playfram 0xbb - wait 1 - playfram 0xaa - wait 1 - playfram 0xbb - wait 1 - nobrkcodeend - gotorepeatattk - ignorerest -SavantGndAttkToIdle: - playfram 0x99 - wait 1 - goto SavantWalkingToIdle - -SavantWalking: - move 4 - wait 1 - 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 - goto SavantWalking + imgul 2004 0 0 # Savant Shadow (cm\terran\savant-shadow.grp) + goto MadcapWalkingToIdle SavantSpecialState1: playfram 0x00 goto ScourgeLocal00 + +SavantEntropyGauntletsTransform: + imgol 1846 0 0 # Savant Entropy Gauntlets transform + playsnd 3077 # Savant Entropy Gauntlets transform 01 + wait 12 + sigorder 1 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -32305,7 +32218,6 @@ QuaziliskGndAttkRpt: wait 1 nobrkcodestart playfram 0x200 - playsndbtwn 1329 1331 # Quazilisk attack 01, 02, 03 imgol 1752 0 0 # Quazilisk Attack Overlay attack wait 1 @@ -42632,11 +42544,11 @@ Unused1 MatadorUnused1 GndAttkRpt MatadorGndAttkInit AirAttkRpt MatadorGndAttkInit CastSpell [NONE] -GndAttkToIdle MatadorGndAttkToIdle -AirAttkToIdle MatadorGndAttkToIdle +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking MatadorWalking -WalkingToIdle MatadorGndAttkToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -42644,15 +42556,7 @@ SpecialState1 [NONE] MatadorInit: imgul 1533 0 0 # Matador Shadow (cm\terran\matador-shadow.grp) playfram 0x00 - goto MatadorGndAttkToIdle - -MatadorGndAttkToIdle: - playfram 0x00 - goto MatadorLocal00 - -MatadorLocal00: - wait 125 - goto MatadorLocal00 + goto InfestedTerranWalkingToIdle MatadorDeath: playsndbtwn 1385 1386 # Matador death 01, 02 @@ -42670,21 +42574,31 @@ MatadorUnused1: setfldirect 12 wait 12 nobrkcodeend - goto MatadorGndAttkToIdle + goto InfestedTerranWalkingToIdle MatadorGndAttkInit: playfram 0x00 wait 1 nobrkcodestart playfram 0x100 - attack - playsndbtwn 2161 2163 # Matador weaponfire 01, 02, 03 + playsndbtwn 2736 2738 # Matador weaponfire 2 01, 02, 03 + imgol 421 0 0 # FlameThrower (thingy\flamer.grp) + attkshiftproj 24 + sigorder 32 + wait 1 + playfram 0x00 + attkshiftproj 52 + sigorder 32 + wait 1 + playfram 0x100 + attkshiftproj 80 + sigorder 32 wait 1 playfram 0x00 wait 3 nobrkcodeend gotorepeatattk - goto MatadorGndAttkToIdle + goto InfestedTerranWalkingToIdle MatadorWalking: playfram 0x20 @@ -42951,6 +42865,101 @@ HippogriffWalking: imgol 1551 0 0 # Hippogriff Engines (cm\terran\hippogriff-engines.grp) goto HippogriffLocal00 +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 353 Facade (cm\terran\facade.grp) +.headerstart +IsId 684 +Type 20 +Init FacadeInit +Death FulcrumDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 +SpecialState1 StarpadBuilt +SpecialState2 [NONE] +AlmostBuilt FacadeAlmostBuilt +Built StarpadBuilt +Landing FacadeLanding +LiftOff FacadeLiftOff +IsWorking FacadeIsWorking +WorkingToIdle StarpadBuilt +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +FacadeInit: + imgul 1133 0 0 # Facade Shadow (cm\terran\facade-shadow.grp) + goto StarpadBuilt + +FacadeAlmostBuilt: + playfram 20 + goto ScourgeLocal00 + +FacadeLanding: + nobrkcodestart + wait 20 + playsnd 472 # Misc\Land.WAV + playfram 0 + wait 20 +# wait 5 +# playfram 0 +# wait 5 +# playfram 0 +# wait 5 +# playfram 0 +# wait 5 + playfram 0x00 + sigorder 16 + nobrkcodeend + goto ScourgeLocal00 + +FacadeLiftOff: + nobrkcodestart + playsnd 471 # Misc\LiftOff.WAV + playfram 0 + wait 15 +# wait 5 +# playfram 0 +# wait 5 +# playfram 0 +# wait 5 +# playfram 0 + sigorder 16 + nobrkcodeend + goto ScourgeLocal00 + +FacadeIsWorking: + playfram 1 + wait 1 + playfram 3 + wait 1 + playfram 5 + wait 1 + playfram 7 + wait 1 + playfram 9 + wait 1 + playfram 11 + wait 1 + playfram 13 + wait 1 + playfram 15 + wait 1 + playfram 17 + wait 1 + playfram 19 + wait 1 + goto FacadeIsWorking + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1085 Wyvern (cm\terran\wyvern.grp) @@ -48151,11 +48160,7 @@ MatadorCinderModeInit: MatadorCinderModeGndAttkToIdle: playfram 0x180 - goto MatadorCinderModeLocal00 - -MatadorCinderModeLocal00: - wait 125 - goto MatadorCinderModeLocal00 + goto ScourgeLocal00 MatadorCinderModeDeath: playsndbtwn 1385 1386 # Matador death 01, 02 @@ -48216,7 +48221,7 @@ MatadorCinderModeSpecialState2: .headerstart IsId 738 Type 12 -Init MatadorTurretInit +Init InfestedTerranWalkingToIdle Death Generic_Wait1End GndAttkInit MatadorGndAttkInit AirAttkInit MatadorGndAttkInit @@ -48224,18 +48229,14 @@ Unused1 [NONE] GndAttkRpt MatadorGndAttkInit AirAttkRpt MatadorGndAttkInit CastSpell [NONE] -GndAttkToIdle MatadorGndAttkToIdle -AirAttkToIdle MatadorGndAttkToIdle +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking MatadorWalking -WalkingToIdle MatadorGndAttkToIdle +WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # - -MatadorTurretInit: - playfram 0x00 - goto MatadorGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -49706,25 +49707,104 @@ QilinWalking: IsId 766 Type 13 Init AurielInit -Death SavantDeath +Death AurielDeath GndAttkInit AurielGndAttkInit AirAttkInit AurielGndAttkInit -Unused1 SavantUnused1 +Unused1 AurielUnused1 GndAttkRpt AurielGndAttkRpt AirAttkRpt AurielGndAttkRpt CastSpell [NONE] -GndAttkToIdle SavantGndAttkToIdle -AirAttkToIdle SavantGndAttkToIdle +GndAttkToIdle AurielGndAttkToIdle +AirAttkToIdle AurielGndAttkToIdle Unused2 [NONE] -Walking SavantWalking -WalkingToIdle SavantWalkingToIdle -SpecialState1 SavantSpecialState1 +Walking AurielWalking +WalkingToIdle AurielWalkingToIdle +SpecialState1 AurielSpecialState1 .headerend # ----------------------------------------------------------------------------- # AurielInit: imgul 1790 0 -5 # Auriel Shadow (cm\faction\auriel-shadow.grp) - goto SavantWalkingToIdle +AurielWalkingToIdle: + playfram 0x00 +AurielLocal00: + wait 62 + randcondjmp 25 AurielLocal01 + randcondjmp 128 AurielLocal01 + goto AurielLocal00 + +AurielLocal01: + playfram 0x00 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + randcondjmp 192 AurielLocal03 + 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 AurielLocal04 + +AurielLocal04: + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + goto AurielWalkingToIdle + +AurielLocal03: + wait 13 + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + goto AurielWalkingToIdle + +AurielDeath: + playsnd 238 # Terran\Ghost\TGhDth00.wav + setfldirect 0 + playfram 0x00 + imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) + wait 2 + lowsprul 950 0 0 # Savant remains + wait 1 + end + +AurielUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1166 1167 + setfldirect 0 + playfram 0x00 + imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) + wait 6 + nobrkcodeend + goto AurielWalkingToIdle AurielGndAttkInit: playfram 0x99 @@ -49747,7 +49827,41 @@ AurielGndAttkRpt: nobrkcodeend gotorepeatattk ignorerest - goto SavantGndAttkToIdle +AurielGndAttkToIdle: + playfram 0x99 + wait 1 + goto AurielWalkingToIdle + +AurielWalking: + move 4 + wait 1 + 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 + goto AurielWalking + +AurielSpecialState1: + playfram 0x00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52216,7 +52330,7 @@ UnarOrbitalDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 189 Pylon (protoss\pylon.grp) +# 1991 Xenolith (cm\protoss\xenolith.grp) .headerstart IsId 811 Type 21 @@ -52246,26 +52360,169 @@ WarpIn XenolithWarpIn # ----------------------------------------------------------------------------- # XenolithInit: - imgul 191 0 0 # Pylon Shadow (protoss\ppyShad.grp) + imgul 1992 0 0 # Xenolith Shadow (cm\protoss\xenolith-shadow.grp) XenolithBuilt: playfram 5 - goto XenolithLocal01 + goto ScourgeLocal00 -XenolithLocal01: - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 8 - wait 2 - playfram 9 - wait 2 - playfram 10 - wait 10 - goto XenolithLocal01 +#XenolithLocal01: +# playfram 6 +# wait 2 +# playfram 7 +# wait 2 +# playfram 8 +# wait 2 +# playfram 9 +# wait 2 +# playfram 10 +# wait 10 +# goto XenolithLocal01 XenolithWarpIn: - imgol 1992 0 0 # Pylon Warp Flash (protoss\pylon.grp) + imgol 1992 0 0 # Xenolith Warp Flash (cm\protoss\xenolith.grp) goto XenolithBuilt + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1997 Landlock (cm\askosi\landlock.grp) +.headerstart +IsId 812 +Type 21 +Init LandlockInit +Death InfestedMinistryDeath +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 ScourgeLocal00 +Landing [NONE] +LiftOff [NONE] +IsWorking LandlockIsWorking +WorkingToIdle LandlockWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +LandlockInit: + imgul 1998 0 0 # Landlock Shadow (cm\askosi\landlock-shadow.grp) +LandlockWorkingToIdle: + playfram 0x00 + goto ScourgeLocal00 + +#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 +# end + +#LandlockBuilt: +# imgol 1820 0 0 # Architect weaponfire channel +# goto ScourgeLocal00 -## Next free IsId: 812 \ No newline at end of file +LandlockIsWorking: +# playfram 1 +# wait 1 +# playfram 2 +# wait 1 +# playfram 3 +# wait 1 +# playfram 4 +# wait 1 +# playfram 5 +# wait 1 +# playfram 6 +# wait 1 +# playfram 7 + wait 1 + goto LandlockIsWorking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2001 Dracadin (protoss\dracadin.grp) +.headerstart +IsId 813 +Type 21 +Init DracadinOrderInit +Death DracadinDeath +GndAttkInit DracadinGndAttkInit +AirAttkInit DracadinGndAttkInit +Unused1 DracadinUnused1 +GndAttkRpt DracadinGndAttkRpt +AirAttkRpt DracadinGndAttkRpt +CastSpell [NONE] +GndAttkToIdle DracadinGndAttkToIdle +AirAttkToIdle DracadinGndAttkToIdle +Unused2 [NONE] +Walking DracadinWalking +WalkingToIdle DracadinWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn DracadinWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +DracadinOrderInit: + imgul 2002 0 0 # Dracadin Order Shadow (faction-p\dracadin-order-shadow.grp) + goto DracadinWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1999 Quazilisk (cm\zerg\quazilisk.grp) +.headerstart +IsId 814 +Type 26 +Init QuazrokorInit +Death QuaziliskDeath +GndAttkInit QuaziliskGndAttkInit +AirAttkInit QuaziliskGndAttkInit +Unused1 QuaziliskUnused1 +GndAttkRpt QuaziliskGndAttkRpt +AirAttkRpt QuaziliskGndAttkRpt +CastSpell [NONE] +GndAttkToIdle QuaziliskGndAttkToIdle +AirAttkToIdle QuaziliskGndAttkToIdle +Unused2 [NONE] +Walking QuaziliskWalking +WalkingToIdle QuaziliskGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 QuaziliskSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow QuaziliskBurrow +UnBurrow QuaziliskUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +QuazrokorInit: + imgul 2000 0 0 # Quazrokor Shadow (cm\faction-z\quazrokor-shadow.grp) + goto QuaziliskGndAttkToIdle + +## Next free IsId: 816 \ No newline at end of file diff --git a/mpq/sound/cm/f-z/quazrokor/wf-01.wav b/mpq/sound/cm/f-z/quazrokor/wf-01.wav new file mode 100644 index 00000000..e87a77d9 Binary files /dev/null and b/mpq/sound/cm/f-z/quazrokor/wf-01.wav differ diff --git a/mpq/sound/cm/f-z/quazrokor/wf-02.wav b/mpq/sound/cm/f-z/quazrokor/wf-02.wav new file mode 100644 index 00000000..90e03c81 Binary files /dev/null and b/mpq/sound/cm/f-z/quazrokor/wf-02.wav differ diff --git a/mpq/sound/cm/f-z/quazrokor/wf-03.wav b/mpq/sound/cm/f-z/quazrokor/wf-03.wav new file mode 100644 index 00000000..4aa9ce5a Binary files /dev/null and b/mpq/sound/cm/f-z/quazrokor/wf-03.wav differ diff --git a/mpq/tileset/ice.cv5 b/mpq/tileset/ice.cv5 index 1b1b395d..f2a1680f 100644 Binary files a/mpq/tileset/ice.cv5 and b/mpq/tileset/ice.cv5 differ diff --git a/mpq/unit/cm/askosi/landlock-shadow.grp b/mpq/unit/cm/askosi/landlock-shadow.grp new file mode 100644 index 00000000..70502b5b Binary files /dev/null and b/mpq/unit/cm/askosi/landlock-shadow.grp differ diff --git a/mpq/unit/cm/askosi/landlock.grp b/mpq/unit/cm/askosi/landlock.grp new file mode 100644 index 00000000..778b1a1e Binary files /dev/null and b/mpq/unit/cm/askosi/landlock.grp differ diff --git a/mpq/unit/cm/faction-p/dracadin-order-death.grp b/mpq/unit/cm/faction-p/dracadin-order-death.grp new file mode 100644 index 00000000..519c3553 Binary files /dev/null and b/mpq/unit/cm/faction-p/dracadin-order-death.grp differ diff --git a/mpq/unit/cm/faction-p/dracadin-order-shadow.grp b/mpq/unit/cm/faction-p/dracadin-order-shadow.grp new file mode 100644 index 00000000..de0d9bd1 Binary files /dev/null and b/mpq/unit/cm/faction-p/dracadin-order-shadow.grp differ diff --git a/mpq/unit/cm/faction-p/dracadin-order.grp b/mpq/unit/cm/faction-p/dracadin-order.grp new file mode 100644 index 00000000..b84a9b1e Binary files /dev/null and b/mpq/unit/cm/faction-p/dracadin-order.grp differ diff --git a/mpq/unit/cm/faction-z/quazrokor-shadow.grp b/mpq/unit/cm/faction-z/quazrokor-shadow.grp new file mode 100644 index 00000000..d7d0708a Binary files /dev/null and b/mpq/unit/cm/faction-z/quazrokor-shadow.grp differ diff --git a/mpq/unit/cm/faction-z/quazrokor.grp b/mpq/unit/cm/faction-z/quazrokor.grp new file mode 100644 index 00000000..b2e85f53 Binary files /dev/null and b/mpq/unit/cm/faction-z/quazrokor.grp differ diff --git a/mpq/unit/cm/protoss/atreus-attack.lol b/mpq/unit/cm/protoss/atreus-attack.lol new file mode 100644 index 00000000..ebfa4fd4 Binary files /dev/null and b/mpq/unit/cm/protoss/atreus-attack.lol differ diff --git a/mpq/unit/cm/protoss/dracadin-attack.lol b/mpq/unit/cm/protoss/dracadin-attack.lol index e509c184..7b0b218e 100644 Binary files a/mpq/unit/cm/protoss/dracadin-attack.lol and b/mpq/unit/cm/protoss/dracadin-attack.lol differ diff --git a/mpq/unit/cm/terran/aerie-damage.lof b/mpq/unit/cm/terran/facade-damage.lof similarity index 100% rename from mpq/unit/cm/terran/aerie-damage.lof rename to mpq/unit/cm/terran/facade-damage.lof diff --git a/mpq/unit/cm/terran/aerie-shadow.grp b/mpq/unit/cm/terran/facade-shadow.grp similarity index 100% rename from mpq/unit/cm/terran/aerie-shadow.grp rename to mpq/unit/cm/terran/facade-shadow.grp diff --git a/mpq/unit/cm/terran/aerie.grp b/mpq/unit/cm/terran/facade.grp similarity index 100% rename from mpq/unit/cm/terran/aerie.grp rename to mpq/unit/cm/terran/facade.grp diff --git a/mpq/unit/cm/terran/savant-entropy-attack.lol b/mpq/unit/cm/terran/savant-entropy-attack.lol new file mode 100644 index 00000000..5856ae3e Binary files /dev/null and b/mpq/unit/cm/terran/savant-entropy-attack.lol differ diff --git a/mpq/unit/cm/terran/savant-entropy-shadow.grp b/mpq/unit/cm/terran/savant-entropy-shadow.grp new file mode 100644 index 00000000..752d48f9 Binary files /dev/null and b/mpq/unit/cm/terran/savant-entropy-shadow.grp differ diff --git a/mpq/unit/cm/terran/savant-entropy.grp b/mpq/unit/cm/terran/savant-entropy.grp new file mode 100644 index 00000000..9f23ea6d Binary files /dev/null and b/mpq/unit/cm/terran/savant-entropy.grp differ diff --git a/mpq/unit/cm/terran/savant-siphon-attack.lol b/mpq/unit/cm/terran/savant-siphon-attack.lol new file mode 100644 index 00000000..abb8d726 Binary files /dev/null and b/mpq/unit/cm/terran/savant-siphon-attack.lol differ diff --git a/mpq/unit/cm/terran/savant-siphon-shadow.grp b/mpq/unit/cm/terran/savant-siphon-shadow.grp new file mode 100644 index 00000000..23b575e4 Binary files /dev/null and b/mpq/unit/cm/terran/savant-siphon-shadow.grp differ diff --git a/mpq/unit/cm/terran/savant-siphon.grp b/mpq/unit/cm/terran/savant-siphon.grp new file mode 100644 index 00000000..acb43dd0 Binary files /dev/null and b/mpq/unit/cm/terran/savant-siphon.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 563829d3..b68b644f 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 82fb0dcb..fb0527e7 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 31287215..cb8eb9f6 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 644366d2..b64d4c2b 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 a82e5e43..a51bf1cf 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ