diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index ea3dc90b..dc8b1dea 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 fd73b84b..252720a6 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -607,9 +607,9 @@ Tirade Scepter Azanthrokor Bounty -Extended Flingy #401 -Extended Flingy #402 -Extended Flingy #403 +Proselyte +Triton +Triton Turret Extended Flingy #404 Extended Flingy #405 Extended Flingy #406 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 9ab587e2..f5b88a21 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 b3d7f1cb..4fff65b7 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 17a87ff3..cc30335e 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2187,12 +2187,12 @@ Bounty Shadow Azanthrokor Birth Azanthrokor Mutate Kethrostalor Birth -Extended Image #1187 -Extended Image #1188 -Extended Image #1189 -Extended Image #1190 -Extended Image #1191 -Extended Image #1192 +Proselyte +Proselyte Shadow +Triton +Triton Shadow +Triton Turret +Helion Engines Extended Image #1193 Extended Image #1194 Extended Image #1195 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 644e9e37..955de755 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 85833547..9a3a3926 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -11,7 +11,7 @@ Attack (Obscured) Attack Unit (Normal) Attack In Range Rematerialize (Askosi) -Salvage (Talos) +Rapid Rendezvous (Askosi) Attack Move Building Is Being Infested Nothing 1 (Unused) @@ -102,7 +102,7 @@ Watch Target Script (Starting Creep Growth) Script (Spread Creep&Spawn Larva) Script (Stopping Creep Growth) -Guardian Aspect (Unused) +Use Ability (Lobotomy Warhead) Move and Morph Archon Completing Archon Summon Hold Position (Normal) @@ -113,14 +113,14 @@ Unload Unit (Transport) Move&Unload Unit (Transport) Use Ability (Yamato Gun) Use Ability On Obscured (Yamato Gun) -Use Ability (Lockdown) +Use Ability (Lobotomy Grenade) Burrow Idle (Burrowed) Unburrow Use Ability (Dark Swarm) Use Ability (Parasite) Use Ability (Spawn Broodling) -Use Ability (EMP Shockwave) +Use Ability (Lobotomy Warhead old) Unknown Idle (Nuclear Silo) Attack (Nuke) diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index a7f47a42..763e7e4b 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 430b1a56..269d0879 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3665,99 +3665,99 @@ Ultrokor Consume 03 Askosi Scrap 01 Askosi Scrap 02 Askosi Scrap 03 -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 -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 -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 -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 +Askosi Advisor - Addon 01 +Askosi Advisor - Addon 02 +Askosi Advisor - Addon Abandoned 01 +Askosi Advisor - Addon Abandoned 02 +Askosi Advisor - Ally Attack A 01 +Askosi Advisor - Ally Attack A 02 +Askosi Advisor - Ally Attack A 03 +Askosi Advisor - Ally Attack B 01 +Askosi Advisor - Ally Attack B 02 +Askosi Advisor - Ally Attack B 03 +Askosi Advisor - Ally Attack K 01 +Askosi Advisor - Ally Attack K 02 +Askosi Advisor - Ally Attack K 03 +Askosi Advisor - Ally Attack P 01 +Askosi Advisor - Ally Attack P 02 +Askosi Advisor - Ally Attack P 03 +Askosi Advisor - Ally Attack T 01 +Askosi Advisor - Ally Attack T 02 +Askosi Advisor - Ally Attack T 03 +Askosi Advisor - Ally Attack Z 01 +Askosi Advisor - Ally Attack Z 02 +Askosi Advisor - Ally Attack Z 03 +Askosi Advisor - Arena 01 +Askosi Advisor - Arena 02 +Askosi Advisor - Army Attack 01 +Askosi Advisor - Army Attack 02 +Askosi Advisor - Army Attack 03 +Askosi Advisor - Army Attack 04 +Askosi Advisor - Assembly 01 +Askosi Advisor - Assembly 02 +Askosi Advisor - Base Attack 01 +Askosi Advisor - Base Attack 02 +Askosi Advisor - Base Attack 03 +Askosi Advisor - Base Attack 04 +Askosi Advisor - Build 01 +Askosi Advisor - Build 02 +Askosi Advisor - Build Zerg 01 +Askosi Advisor - Build Zerg 02 +Askosi Advisor - Energy 01 +Askosi Advisor - Energy 02 +Askosi Advisor - Energy 03 +Askosi Advisor - Energy 04 +Askosi Advisor - Landing Interrupted 01 +Askosi Advisor - Landing Interrupted 02 +Askosi Advisor - Minerals 01 +Askosi Advisor - Minerals 02 +Askosi Advisor - Minerals 03 +Askosi Advisor - Minerals 04 +Askosi Advisor - Missile Armed 01 +Askosi Advisor - Missile Armed 02 +Askosi Advisor - Missile Launch 01 +Askosi Advisor - Missile Launch 02 +Askosi Advisor - No Build 01 +Askosi Advisor - No Build 02 +Askosi Advisor - No Land 01 +Askosi Advisor - No Land 02 +Askosi Advisor - No Warp 01 +Askosi Advisor - No Warp 02 +Askosi Advisor - Ritual 01 +Askosi Advisor - Ritual 02 +Askosi Advisor - Tech 01 +Askosi Advisor - Tech 02 +Askosi Advisor - Vespene 01 +Askosi Advisor - Vespene 02 +Askosi Advisor - Vespene 03 +Askosi Advisor - Vespene 04 +Askosi Advisor - Warp 01 +Askosi Advisor - Warp 02 +Triton Ready 01 +Triton Ready 02 +Triton Ready 03 +Triton Selected 01 +Triton Selected 02 +Triton Selected 03 +Triton Selected 04 +Triton Order Passive 01 +Triton Order Passive 02 +Triton Order Passive 03 +Triton Order Passive 04 +Triton Order Aggressive 01 +Triton Order Aggressive 02 +Triton Order Aggressive 03 +Triton Order Aggressive 04 +Triton Under Attack 01 +Triton Under Attack 02 +Triton Under Attack 03 +Triton Under Attack 04 +Triton Ability Fire 01 +Triton Ability Fire 02 +Triton Ability Fire 03 +Triton Ability Hit 01 +Triton Weapon Fire 01 +Triton Weapon Fire 02 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 0bdd3eb7..efec279e 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3648,6 +3648,7 @@ cm\z\larva\spawn-01.wav cm\z\larva\spawn-02.wav cm\z\larva\spawn-03.wav cm\p\_building\ancestral-archives\wht-01.wav +cm\z\_building\kethraj-keep.wav cm\z\gorgrokor\dth-01.wav cm\z\gorgrokor\dth-02.wav cm\z\kethrostalor\wf-01.wav @@ -3663,4 +3664,97 @@ cm\z\ultrokor\eat-02.wav cm\z\ultrokor\eat-03.wav cm\a\scrap-01.wav cm\a\scrap-02.wav -cm\a\scrap-03.wav \ No newline at end of file +cm\a\scrap-03.wav +cm\advisors\askosi\askosiad_addon-01.wav +cm\advisors\askosi\askosiad_addon-02.wav +cm\advisors\askosi\askosiad_addonabandon-01.wav +cm\advisors\askosi\askosiad_addonabandon-02.wav +cm\advisors\askosi\askosiad_allyattack-a-01.wav +cm\advisors\askosi\askosiad_allyattack-a-02.wav +cm\advisors\askosi\askosiad_allyattack-a-03.wav +cm\advisors\askosi\askosiad_allyattack-b-01.wav +cm\advisors\askosi\askosiad_allyattack-b-02.wav +cm\advisors\askosi\askosiad_allyattack-b-03.wav +cm\advisors\askosi\askosiad_allyattack-k-01.wav +cm\advisors\askosi\askosiad_allyattack-k-02.wav +cm\advisors\askosi\askosiad_allyattack-k-03.wav +cm\advisors\askosi\askosiad_allyattack-p-01.wav +cm\advisors\askosi\askosiad_allyattack-p-02.wav +cm\advisors\askosi\askosiad_allyattack-p-03.wav +cm\advisors\askosi\askosiad_allyattack-t-01.wav +cm\advisors\askosi\askosiad_allyattack-t-02.wav +cm\advisors\askosi\askosiad_allyattack-t-03.wav +cm\advisors\askosi\askosiad_allyattack-z-01.wav +cm\advisors\askosi\askosiad_allyattack-z-02.wav +cm\advisors\askosi\askosiad_allyattack-z-03.wav +cm\advisors\askosi\askosiad_arena-01.wav +cm\advisors\askosi\askosiad_arena-02.wav +cm\advisors\askosi\askosiad_armyattack-01.wav +cm\advisors\askosi\askosiad_armyattack-02.wav +cm\advisors\askosi\askosiad_armyattack-03.wav +cm\advisors\askosi\askosiad_armyattack-04.wav +cm\advisors\askosi\askosiad_assembly-01.wav +cm\advisors\askosi\askosiad_assembly-02.wav +cm\advisors\askosi\askosiad_baseattack-01.wav +cm\advisors\askosi\askosiad_baseattack-02.wav +cm\advisors\askosi\askosiad_baseattack-03.wav +cm\advisors\askosi\askosiad_baseattack-04.wav +cm\advisors\askosi\askosiad_build-01.wav +cm\advisors\askosi\askosiad_build-02.wav +cm\advisors\askosi\askosiad_buildzerg-01.wav +cm\advisors\askosi\askosiad_buildzerg-02.wav +cm\advisors\askosi\askosiad_energy-01.wav +cm\advisors\askosi\askosiad_energy-02.wav +cm\advisors\askosi\askosiad_energy-03.wav +cm\advisors\askosi\askosiad_energy-04.wav +cm\advisors\askosi\askosiad_intland-01.wav +cm\advisors\askosi\askosiad_intland-02.wav +cm\advisors\askosi\askosiad_minerals-01.wav +cm\advisors\askosi\askosiad_minerals-02.wav +cm\advisors\askosi\askosiad_minerals-03.wav +cm\advisors\askosi\askosiad_minerals-04.wav +cm\advisors\askosi\askosiad_missile-01.wav +cm\advisors\askosi\askosiad_missile-02.wav +cm\advisors\askosi\askosiad_missilelaunch-01.wav +cm\advisors\askosi\askosiad_missilelaunch-02.wav +cm\advisors\askosi\askosiad_nobuild-01.wav +cm\advisors\askosi\askosiad_nobuild-02.wav +cm\advisors\askosi\askosiad_noland-01.wav +cm\advisors\askosi\askosiad_noland-02.wav +cm\advisors\askosi\askosiad_nowarp-01.wav +cm\advisors\askosi\askosiad_nowarp-02.wav +cm\advisors\askosi\askosiad_ritual-01.wav +cm\advisors\askosi\askosiad_ritual-02.wav +cm\advisors\askosi\askosiad_tech-01.wav +cm\advisors\askosi\askosiad_tech-02.wav +cm\advisors\askosi\askosiad_vespene-01.wav +cm\advisors\askosi\askosiad_vespene-02.wav +cm\advisors\askosi\askosiad_vespene-03.wav +cm\advisors\askosi\askosiad_vespene-04.wav +cm\advisors\askosi\askosiad_warp-01.wav +cm\advisors\askosi\askosiad_warp-02.wav +cm\t\triton\rdy-01.wav +cm\t\triton\rdy-02.wav +cm\t\triton\rdy-03.wav +cm\t\triton\wht-01.wav +cm\t\triton\wht-02.wav +cm\t\triton\wht-03.wav +cm\t\triton\wht-04.wav +cm\t\triton\yes-01.wav +cm\t\triton\yes-02.wav +cm\t\triton\yes-03.wav +cm\t\triton\yes-04.wav +cm\t\triton\agg-01.wav +cm\t\triton\agg-02.wav +cm\t\triton\agg-03.wav +cm\t\triton\agg-04.wav +cm\t\triton\hlp-01.wav +cm\t\triton\hlp-02.wav +cm\t\triton\hlp-03.wav +cm\t\triton\hlp-04.wav +cm\t\triton\abilityfire-01.wav +cm\t\triton\abilityfire-02.wav +cm\t\triton\abilityfire-03.wav +cm\t\triton\abilityhit-01.wav +cm\t\triton\wf-01.wav +cm\t\triton\wf-02.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index ba79a8de..c05f538c 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 4e4239c0..97cedf2c 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1054,9 +1054,9 @@ Tirade Scepter Azanthrokor Bounty -Extended Sprite #540 -Extended Sprite #541 -Extended Sprite #542 +Proselyte +Triton +Triton Turret Extended Sprite #543 Extended Sprite #544 Extended Sprite #545 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 9e7663de..3c8ba6dc 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 e20363f7..cb09bf22 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -7,7 +7,7 @@ Siege Mode (Phalanx) Defensive Matrix (Azazel) Irradiate (Seraph) Yamato Cannon (Magnetar) -Select Assimilated (unused) +Rapid Rendezvous (Askosi) Personnel Cloaking (unused) Burrowing (Zerg) Infestation (unused) @@ -21,7 +21,7 @@ Psionic Storm (Cantavis) Hallucination (Cantavis) Recall (Didact) Stasis Field (Didact) -Rematerialize +Rematerialize (Askosi) Savant Onhit Toggle Disruption Field (Lanifect) Rescind Control (Mind Tyrant) @@ -44,7 +44,7 @@ Through the Looking Glass (Hypnagogue) None None Through the Looking Glass (Hypnagogue) -Adaptation (Kazitrith Colony) +Lobotomy Warhead (Triton) Prying Eyes (Facade) Extended Tech #5 Extended Tech #6 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 46de8408..313b1f7f 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 37353fe7..83642657 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -510,8 +510,8 @@ Terran Madrigal (Hecaton, Furia) Madrigal Turret (Hecaton, Furia) Askosi Bounty Zerg Azanthrokor (Orkoti) -Extended Unit #285 -Extended Unit #286 +Terran Triton +Triton Turret Extended Unit #287 Extended Unit #288 Extended Unit #289 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index b0afe48d..06fb2dea 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 0375d011..a129f45e 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -30,7 +30,7 @@ Monstrous Maw (Zoryusthaleth) Longbolt Missiles (Watchdog) Yamato Cannon (Magnetar ability) Nuclear Missile -Lobotomy Grenade (Francisco Goska) +Lobotomy Grenade (Goska) EMP Shockwave (unused) Irradiate (Seraph ability) Zethrok Claws (Zethrokor) @@ -243,9 +243,9 @@ Phlegethon Cannons (Arhaun) Homing Spore (Liiralisk) Zulu Sidekicks (Cannibal) Staggered Spores (Kethrostalor) -Extended Weapon #116 -Extended Weapon #117 -Extended Weapon #118 +Hydria Cannons (Triton) +Lobotomy Warhead (Triton) +Rapid Rendezvous (Askosi) Micken Melter (Ackmed) Medusa Rifle (Francisco Goska) Extended Weapon #121 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 70fa6624..dcbda9a5 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 701ad173..ef856588 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 ff2d2e55..3fe534b6 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 70d59e04..edb94388 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 29ae4507..33c68ff5 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index b5a14c64..a82b1cb5 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 7cfcece2..bffdac8d 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 2a948c33..e8ce5650 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 2b418cfb..aa3521aa 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1470,16 +1470,20 @@ HelionDeath: HelionGndAttkInit: setvertpos 0 - playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x20 attackwith 2 - playsnd 106 # Bullet\tvuFir00.wav + playsndbtwn 1217 1221 # Vassal weaponfire 01, 02, 03, 04, 05 wait 1 + playfram 0x00 + nobrkcodeend gotorepeatattk goto HelionGndAttkToIdle HelionWalking: setvertpos 0 -# imgol 225 0 5 # Helion Engines (thingy\tdrGlow.grp) + imgol 2194 0 0 # Helion Engines (cm\askosi\helion-engine.grp) goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # @@ -1600,4 +1604,199 @@ ScepterGndAttkInit: ScepterWalking: setvertpos 0 # imgol 225 0 5 # Scepter Engines (thingy\tdrGlow.grp) - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2189 Proselyte (cm\askosi\proselyte.grp) +.headerstart +IsId 20 +Type 12 +Init ProselyteInit +Death ProselyteDeath +GndAttkInit ProselyteGndAttkInit +AirAttkInit [NONE] +Unused1 ProselyteUnused1 +GndAttkRpt ProselyteGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle ProselyteGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking ProselyteWalking +WalkingToIdle ProselyteWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ProselyteInit: + imgul 2190 0 0 # Proselyte Shadow (cm\askosi\proselyte-shadow.grp) +ProselyteWalkingToIdle: + playfram 0x00 +ProselyteLocal00: + wait 63 + randcondjmp 25 ProselyteLocal01 + randcondjmp 128 ProselyteLocal02 + goto ProselyteLocal00 + +ProselyteLocal01: + playfram 0x20 + wait 1 + randcondjmp 192 ProselyteLocal03 + 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 ProselyteWalkingToIdle + +ProselyteLocal03: + wait 13 + goto ProselyteWalkingToIdle + +ProselyteLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto ProselyteWalkingToIdle + +ProselyteDeath: + 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 2085 0 0 # Proselyte Remnants (cm\askosi\proselyte-remnants.grp) + wait 1 + end + +ProselyteUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto ProselyteWalkingToIdle + +ProselyteGndAttkInit: + playfram 0x20 +ProselyteGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x40 + attackwith 1 + wait 1 + playfram 0x20 + wait 1 + nobrkcodeend + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + gotorepeatattk + ignorerest +ProselyteGndAttkToIdle: + goto ProselyteWalkingToIdle + +ProselyteWalking: + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x140 + move 4 + wait 1 + playfram 0x60 + goto ProselyteWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2194 Helion Engines (cm\askosi\helion-engine.grp) +.headerstart +IsId 730 +Type 15 +Init Engines_MultiGlowHeader_OmniInit +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End +Unused1 [NONE] +GndAttkRpt Generic_Wait1End +AirAttkRpt Generic_Wait1End +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End +Unused2 [NONE] +Walking Engines_MultiGlowHeader_OmniInit +WalkingToIdle Generic_Wait1End +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +Engines_MultiGlowHeader_OmniInit: + engframe 0 + wait 1 + engframe 32 + wait 1 + goto Engines_MultiGlowHeader_OmniInit \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index edf49be2..ea2240f1 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 c54dca0b..986422b2 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -19713,4 +19713,179 @@ EidolonNydusSpecialState1: wait 1 playfram 0x22 wait 1 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2191 Triton Base (cm\terran\triton-base.grp) +.headerstart +IsId 836 +Type 12 +Init Triton_Base_Init +Death Triton_Base_Death +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 +Unused1 Triton_Base_Unused1 +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 +CastSpell Triton_Base_CastSpell +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Triton_Base_Walking +WalkingToIdle Triton_Base_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Triton_Base_Init: + imgul 2192 0 0 # Triton Shadow (cm\terran\triton-shadow.grp) +Triton_Base_WalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +Triton_Base_Death: + playsnd 2820 # Triton death 01 + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 817 0 0 # Triton Remains + end + +Triton_Base_Unused1: + wait 1 + nobrkcodestart + playsnd 1700 + sprol 742 0 0 + wait 12 + setfldirect 13 + nobrkcodeend + goto Triton_Base_WalkingToIdle + +Triton_Base_CastSpell: + wait 1 + playsndbtwn 3754 3756 # Triton abilityfire 01, 02, 03 + castspell + gotorepeatattk + sigorder 2 + goto Triton_Base_WalkingToIdle + +Triton_Base_Walking: + move 5 + wait 1 + playfram 0x99 + move 5 + wait 1 + playfram 0xaa + move 5 + wait 1 + playfram 0xbb + move 5 + wait 1 + playfram 0xcc + move 5 + 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 + playfram 0x66 + move 5 + wait 1 + playfram 0x77 + move 5 + wait 1 + playfram 0x88 + goto Triton_Base_Walking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2193 Triton Turret (cm\terran\triton-turret.grp) +.headerstart +IsId 837 +Type 12 +Init Triton_Turret_Init +Death Generic_Wait1End +GndAttkInit Triton_Turret_GndAttkInit +AirAttkInit Triton_Turret_GndAttkInit +Unused1 [NONE] +GndAttkRpt Triton_Turret_GndAttkInit +AirAttkRpt Triton_Turret_GndAttkInit +CastSpell SkryrokorLocal00 +GndAttkToIdle Triton_Turret_Init +AirAttkToIdle Triton_Turret_Init +Unused2 [NONE] +Walking Triton_Turret_Walking +WalkingToIdle Triton_Turret_Init +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Triton_Turret_Init: + playfram 0x00 + goto SkryrokorLocal00 + +Triton_Turret_GndAttkInit: + wait 1 + nobrkcodestart + playfram 0xdd + playsndbtwn 3758 3759 # Triton weaponfire 01, 02 + attackwith 1 + wait 1 + playfram 0xee + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto Triton_Turret_Init + +Triton_Turret_Walking: + move 0 + wait 1 + playfram 0x99 + move 0 + wait 1 + playfram 0xaa + move 0 + wait 1 + playfram 0xbb + move 0 + wait 1 + playfram 0xcc + move 0 + wait 1 + playfram 0x11 + move 0 + wait 1 + playfram 0x22 + move 0 + wait 1 + playfram 0x33 + move 0 + wait 1 + playfram 0x44 + move 0 + wait 1 + playfram 0x55 + move 0 + wait 1 + playfram 0x66 + move 0 + wait 1 + playfram 0x77 + move 0 + wait 1 + playfram 0x88 + goto Triton_Turret_Walking \ No newline at end of file diff --git a/mpq/sound/cm/a/helion/wf-01.wav b/mpq/sound/cm/a/helion/wf-01.wav new file mode 100644 index 00000000..8bdd2f30 Binary files /dev/null and b/mpq/sound/cm/a/helion/wf-01.wav differ diff --git a/mpq/sound/cm/a/helion/wf-02.wav b/mpq/sound/cm/a/helion/wf-02.wav new file mode 100644 index 00000000..1c47a68f Binary files /dev/null and b/mpq/sound/cm/a/helion/wf-02.wav differ diff --git a/mpq/sound/cm/a/helion/wf-03.wav b/mpq/sound/cm/a/helion/wf-03.wav new file mode 100644 index 00000000..db967087 Binary files /dev/null and b/mpq/sound/cm/a/helion/wf-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_addon-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_addon-01.wav new file mode 100644 index 00000000..274f6896 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_addon-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_addon-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_addon-02.wav new file mode 100644 index 00000000..b8a3cca8 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_addon-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_addonabandon-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_addonabandon-01.wav new file mode 100644 index 00000000..0fadfe6f Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_addonabandon-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_addonabandon-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_addonabandon-02.wav new file mode 100644 index 00000000..22d8d0b6 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_addonabandon-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-01.wav new file mode 100644 index 00000000..f2be8a13 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-02.wav new file mode 100644 index 00000000..50da97d3 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-03.wav new file mode 100644 index 00000000..213b6a7a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-a-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-01.wav new file mode 100644 index 00000000..94fbe0bd Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-02.wav new file mode 100644 index 00000000..8c4e1ef1 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-03.wav new file mode 100644 index 00000000..b44f302d Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-b-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-01.wav new file mode 100644 index 00000000..3023723e Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-02.wav new file mode 100644 index 00000000..d7f71298 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-03.wav new file mode 100644 index 00000000..4b49fd54 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-k-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-01.wav new file mode 100644 index 00000000..e9d66a64 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-02.wav new file mode 100644 index 00000000..994f2142 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-03.wav new file mode 100644 index 00000000..c239c965 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-p-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-01.wav new file mode 100644 index 00000000..fb71e550 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-02.wav new file mode 100644 index 00000000..9b5e6d67 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-03.wav new file mode 100644 index 00000000..d6e8e22a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-t-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-01.wav new file mode 100644 index 00000000..caab068c Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-02.wav new file mode 100644 index 00000000..4b261c5d Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-03.wav new file mode 100644 index 00000000..37acad9c Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_allyunderattack-z-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_arena-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_arena-01.wav new file mode 100644 index 00000000..498fc79c Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_arena-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_arena-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_arena-02.wav new file mode 100644 index 00000000..7473effa Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_arena-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_armyattack-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-01.wav new file mode 100644 index 00000000..c6449d8a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_armyattack-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-02.wav new file mode 100644 index 00000000..20c3a18a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_armyattack-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-03.wav new file mode 100644 index 00000000..1f0d0152 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_armyattack-04.wav b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-04.wav new file mode 100644 index 00000000..f5929975 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_armyattack-04.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_assembly-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_assembly-01.wav new file mode 100644 index 00000000..2154fa88 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_assembly-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_assembly-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_assembly-02.wav new file mode 100644 index 00000000..37105088 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_assembly-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_baseattack-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-01.wav new file mode 100644 index 00000000..4bdd2049 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_baseattack-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-02.wav new file mode 100644 index 00000000..294a840d Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_baseattack-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-03.wav new file mode 100644 index 00000000..5cbed421 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_baseattack-04.wav b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-04.wav new file mode 100644 index 00000000..9dbabb09 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_baseattack-04.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_build-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_build-01.wav new file mode 100644 index 00000000..48702595 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_build-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_build-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_build-02.wav new file mode 100644 index 00000000..4d01e371 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_build-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_buildzerg-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_buildzerg-01.wav new file mode 100644 index 00000000..bd8ea089 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_buildzerg-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_buildzerg-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_buildzerg-02.wav new file mode 100644 index 00000000..3635e6dc Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_buildzerg-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_energy-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_energy-01.wav new file mode 100644 index 00000000..473b2d43 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_energy-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_energy-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_energy-02.wav new file mode 100644 index 00000000..048f3072 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_energy-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_energy-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_energy-03.wav new file mode 100644 index 00000000..df64ac77 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_energy-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_energy-04.wav b/mpq/sound/cm/advisors/askosi/askosiad_energy-04.wav new file mode 100644 index 00000000..f803198a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_energy-04.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_intland-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_intland-01.wav new file mode 100644 index 00000000..51d589f4 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_intland-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_intland-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_intland-02.wav new file mode 100644 index 00000000..8b01d2ae Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_intland-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_minerals-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_minerals-01.wav new file mode 100644 index 00000000..ee986984 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_minerals-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_minerals-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_minerals-02.wav new file mode 100644 index 00000000..b4e0b7ae Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_minerals-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_minerals-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_minerals-03.wav new file mode 100644 index 00000000..c12cdb09 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_minerals-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_minerals-04.wav b/mpq/sound/cm/advisors/askosi/askosiad_minerals-04.wav new file mode 100644 index 00000000..0ef7bfaa Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_minerals-04.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_missile-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_missile-01.wav new file mode 100644 index 00000000..02f876cf Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_missile-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_missile-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_missile-02.wav new file mode 100644 index 00000000..e90728b5 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_missile-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_missilelaunch-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_missilelaunch-01.wav new file mode 100644 index 00000000..e1c70fb5 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_missilelaunch-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_missilelaunch-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_missilelaunch-02.wav new file mode 100644 index 00000000..3756b49c Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_missilelaunch-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_nobuild-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_nobuild-01.wav new file mode 100644 index 00000000..95474356 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_nobuild-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_nobuild-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_nobuild-02.wav new file mode 100644 index 00000000..c6333f79 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_nobuild-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_noland-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_noland-01.wav new file mode 100644 index 00000000..f7b9c02f Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_noland-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_noland-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_noland-02.wav new file mode 100644 index 00000000..ea5b6beb Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_noland-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_nowarp-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_nowarp-01.wav new file mode 100644 index 00000000..0e6ccbf1 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_nowarp-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_nowarp-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_nowarp-02.wav new file mode 100644 index 00000000..e6a7534d Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_nowarp-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_ritual-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_ritual-01.wav new file mode 100644 index 00000000..a59f9983 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_ritual-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_ritual-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_ritual-02.wav new file mode 100644 index 00000000..3dcab7a7 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_ritual-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_tech-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_tech-01.wav new file mode 100644 index 00000000..186c933a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_tech-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_tech-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_tech-02.wav new file mode 100644 index 00000000..2c721287 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_tech-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_vespene-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_vespene-01.wav new file mode 100644 index 00000000..737486fb Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_vespene-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_vespene-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_vespene-02.wav new file mode 100644 index 00000000..ef04aeb2 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_vespene-02.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_vespene-03.wav b/mpq/sound/cm/advisors/askosi/askosiad_vespene-03.wav new file mode 100644 index 00000000..0e570c73 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_vespene-03.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_vespene-04.wav b/mpq/sound/cm/advisors/askosi/askosiad_vespene-04.wav new file mode 100644 index 00000000..51b8178a Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_vespene-04.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_warp-01.wav b/mpq/sound/cm/advisors/askosi/askosiad_warp-01.wav new file mode 100644 index 00000000..04c5c61e Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_warp-01.wav differ diff --git a/mpq/sound/cm/advisors/askosi/askosiad_warp-02.wav b/mpq/sound/cm/advisors/askosi/askosiad_warp-02.wav new file mode 100644 index 00000000..b7be6ce1 Binary files /dev/null and b/mpq/sound/cm/advisors/askosi/askosiad_warp-02.wav differ diff --git a/mpq/sound/cm/t/triton/abilityfire-01.wav b/mpq/sound/cm/t/triton/abilityfire-01.wav new file mode 100644 index 00000000..da0b363e Binary files /dev/null and b/mpq/sound/cm/t/triton/abilityfire-01.wav differ diff --git a/mpq/sound/cm/t/triton/abilityfire-02.wav b/mpq/sound/cm/t/triton/abilityfire-02.wav new file mode 100644 index 00000000..efac62d2 Binary files /dev/null and b/mpq/sound/cm/t/triton/abilityfire-02.wav differ diff --git a/mpq/sound/cm/t/triton/abilityfire-03.wav b/mpq/sound/cm/t/triton/abilityfire-03.wav new file mode 100644 index 00000000..59e2992d Binary files /dev/null and b/mpq/sound/cm/t/triton/abilityfire-03.wav differ diff --git a/mpq/sound/cm/t/triton/abilityhit-01.wav b/mpq/sound/cm/t/triton/abilityhit-01.wav new file mode 100644 index 00000000..594244c0 Binary files /dev/null and b/mpq/sound/cm/t/triton/abilityhit-01.wav differ diff --git a/mpq/sound/cm/t/triton/agg-01.wav b/mpq/sound/cm/t/triton/agg-01.wav new file mode 100644 index 00000000..4bb2ae77 Binary files /dev/null and b/mpq/sound/cm/t/triton/agg-01.wav differ diff --git a/mpq/sound/cm/t/triton/agg-02.wav b/mpq/sound/cm/t/triton/agg-02.wav new file mode 100644 index 00000000..0ecdafbc Binary files /dev/null and b/mpq/sound/cm/t/triton/agg-02.wav differ diff --git a/mpq/sound/cm/t/triton/agg-03.wav b/mpq/sound/cm/t/triton/agg-03.wav new file mode 100644 index 00000000..2e2a3bb4 Binary files /dev/null and b/mpq/sound/cm/t/triton/agg-03.wav differ diff --git a/mpq/sound/cm/t/triton/agg-04.wav b/mpq/sound/cm/t/triton/agg-04.wav new file mode 100644 index 00000000..3291bc54 Binary files /dev/null and b/mpq/sound/cm/t/triton/agg-04.wav differ diff --git a/mpq/sound/cm/t/triton/hlp-01.wav b/mpq/sound/cm/t/triton/hlp-01.wav new file mode 100644 index 00000000..18d69297 Binary files /dev/null and b/mpq/sound/cm/t/triton/hlp-01.wav differ diff --git a/mpq/sound/cm/t/triton/hlp-02.wav b/mpq/sound/cm/t/triton/hlp-02.wav new file mode 100644 index 00000000..c08f58e9 Binary files /dev/null and b/mpq/sound/cm/t/triton/hlp-02.wav differ diff --git a/mpq/sound/cm/t/triton/hlp-03.wav b/mpq/sound/cm/t/triton/hlp-03.wav new file mode 100644 index 00000000..e275a598 Binary files /dev/null and b/mpq/sound/cm/t/triton/hlp-03.wav differ diff --git a/mpq/sound/cm/t/triton/hlp-04.wav b/mpq/sound/cm/t/triton/hlp-04.wav new file mode 100644 index 00000000..1dce2319 Binary files /dev/null and b/mpq/sound/cm/t/triton/hlp-04.wav differ diff --git a/mpq/sound/cm/t/triton/rdy-01.wav b/mpq/sound/cm/t/triton/rdy-01.wav new file mode 100644 index 00000000..109d077f Binary files /dev/null and b/mpq/sound/cm/t/triton/rdy-01.wav differ diff --git a/mpq/sound/cm/t/triton/rdy-02.wav b/mpq/sound/cm/t/triton/rdy-02.wav new file mode 100644 index 00000000..af69fbef Binary files /dev/null and b/mpq/sound/cm/t/triton/rdy-02.wav differ diff --git a/mpq/sound/cm/t/triton/rdy-03.wav b/mpq/sound/cm/t/triton/rdy-03.wav new file mode 100644 index 00000000..d54c0535 Binary files /dev/null and b/mpq/sound/cm/t/triton/rdy-03.wav differ diff --git a/mpq/sound/cm/t/triton/wf-01.wav b/mpq/sound/cm/t/triton/wf-01.wav new file mode 100644 index 00000000..35604a7b Binary files /dev/null and b/mpq/sound/cm/t/triton/wf-01.wav differ diff --git a/mpq/sound/cm/t/triton/wf-02.wav b/mpq/sound/cm/t/triton/wf-02.wav new file mode 100644 index 00000000..a770b468 Binary files /dev/null and b/mpq/sound/cm/t/triton/wf-02.wav differ diff --git a/mpq/sound/cm/t/triton/wht-01.wav b/mpq/sound/cm/t/triton/wht-01.wav new file mode 100644 index 00000000..ab5a2ea9 Binary files /dev/null and b/mpq/sound/cm/t/triton/wht-01.wav differ diff --git a/mpq/sound/cm/t/triton/wht-02.wav b/mpq/sound/cm/t/triton/wht-02.wav new file mode 100644 index 00000000..6139845b Binary files /dev/null and b/mpq/sound/cm/t/triton/wht-02.wav differ diff --git a/mpq/sound/cm/t/triton/wht-03.wav b/mpq/sound/cm/t/triton/wht-03.wav new file mode 100644 index 00000000..0fb25aca Binary files /dev/null and b/mpq/sound/cm/t/triton/wht-03.wav differ diff --git a/mpq/sound/cm/t/triton/wht-04.wav b/mpq/sound/cm/t/triton/wht-04.wav new file mode 100644 index 00000000..d1ab81a2 Binary files /dev/null and b/mpq/sound/cm/t/triton/wht-04.wav differ diff --git a/mpq/sound/cm/t/triton/yes-01.wav b/mpq/sound/cm/t/triton/yes-01.wav new file mode 100644 index 00000000..3f94c921 Binary files /dev/null and b/mpq/sound/cm/t/triton/yes-01.wav differ diff --git a/mpq/sound/cm/t/triton/yes-02.wav b/mpq/sound/cm/t/triton/yes-02.wav new file mode 100644 index 00000000..2f3e7c31 Binary files /dev/null and b/mpq/sound/cm/t/triton/yes-02.wav differ diff --git a/mpq/sound/cm/t/triton/yes-03.wav b/mpq/sound/cm/t/triton/yes-03.wav new file mode 100644 index 00000000..fa51a0e7 Binary files /dev/null and b/mpq/sound/cm/t/triton/yes-03.wav differ diff --git a/mpq/sound/cm/t/triton/yes-04.wav b/mpq/sound/cm/t/triton/yes-04.wav new file mode 100644 index 00000000..048cb69d Binary files /dev/null and b/mpq/sound/cm/t/triton/yes-04.wav differ diff --git a/mpq/tileset/Jungle.cv5 b/mpq/tileset/Jungle.cv5 index bdea53db..54bbd5dd 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 5eda01fe..a347e174 100644 Binary files a/mpq/tileset/Jungle.vf4 and b/mpq/tileset/Jungle.vf4 differ diff --git a/mpq/tileset/Jungle.vr4 b/mpq/tileset/Jungle.vr4 index 15d30422..89f1da91 100644 Binary files a/mpq/tileset/Jungle.vr4 and b/mpq/tileset/Jungle.vr4 differ diff --git a/mpq/tileset/Jungle.vx4ex b/mpq/tileset/Jungle.vx4ex index c720b522..e400c75e 100644 Binary files a/mpq/tileset/Jungle.vx4ex and b/mpq/tileset/Jungle.vx4ex differ diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5 index 2a21c695..dc024446 100644 Binary files a/mpq/tileset/badlands.cv5 and b/mpq/tileset/badlands.cv5 differ diff --git a/mpq/tileset/badlands.vf4 b/mpq/tileset/badlands.vf4 index 8607229f..d035e469 100644 Binary files a/mpq/tileset/badlands.vf4 and b/mpq/tileset/badlands.vf4 differ diff --git a/mpq/tileset/badlands.vr4 b/mpq/tileset/badlands.vr4 index 8c652225..10c35621 100644 Binary files a/mpq/tileset/badlands.vr4 and b/mpq/tileset/badlands.vr4 differ diff --git a/mpq/tileset/badlands.vx4ex b/mpq/tileset/badlands.vx4ex index b120166a..d04c4b06 100644 Binary files a/mpq/tileset/badlands.vx4ex and b/mpq/tileset/badlands.vx4ex differ diff --git a/mpq/unit/cm/askosi/helion-attack.lol b/mpq/unit/cm/askosi/helion-attack.lol new file mode 100644 index 00000000..adc8e60a Binary files /dev/null and b/mpq/unit/cm/askosi/helion-attack.lol differ diff --git a/mpq/unit/cm/askosi/helion-engine.grp b/mpq/unit/cm/askosi/helion-engine.grp new file mode 100644 index 00000000..42b458dd Binary files /dev/null and b/mpq/unit/cm/askosi/helion-engine.grp differ diff --git a/mpq/unit/cm/askosi/helion.grp b/mpq/unit/cm/askosi/helion.grp index 512cb7de..fda8c1b9 100644 Binary files a/mpq/unit/cm/askosi/helion.grp and b/mpq/unit/cm/askosi/helion.grp differ diff --git a/mpq/unit/cm/askosi/proselyte-shadow.grp b/mpq/unit/cm/askosi/proselyte-shadow.grp new file mode 100644 index 00000000..8291cc0a Binary files /dev/null and b/mpq/unit/cm/askosi/proselyte-shadow.grp differ diff --git a/mpq/unit/cm/askosi/proselyte.grp b/mpq/unit/cm/askosi/proselyte.grp new file mode 100644 index 00000000..1ac04805 Binary files /dev/null and b/mpq/unit/cm/askosi/proselyte.grp differ diff --git a/mpq/unit/cm/terran/future-station.grp b/mpq/unit/cm/terran/future-station.grp index 41df6513..7b3007d0 100644 Binary files a/mpq/unit/cm/terran/future-station.grp and b/mpq/unit/cm/terran/future-station.grp differ diff --git a/mpq/unit/cm/terran/triton-ability.lol b/mpq/unit/cm/terran/triton-ability.lol new file mode 100644 index 00000000..6c6e09ca Binary files /dev/null and b/mpq/unit/cm/terran/triton-ability.lol differ diff --git a/mpq/unit/cm/terran/triton-attack.lol b/mpq/unit/cm/terran/triton-attack.lol new file mode 100644 index 00000000..3f771e37 Binary files /dev/null and b/mpq/unit/cm/terran/triton-attack.lol differ diff --git a/mpq/unit/cm/terran/triton-base.grp b/mpq/unit/cm/terran/triton-base.grp new file mode 100644 index 00000000..d3cc75f1 Binary files /dev/null and b/mpq/unit/cm/terran/triton-base.grp differ diff --git a/mpq/unit/cm/terran/triton-shadow.grp b/mpq/unit/cm/terran/triton-shadow.grp new file mode 100644 index 00000000..437ab682 Binary files /dev/null and b/mpq/unit/cm/terran/triton-shadow.grp differ diff --git a/mpq/unit/cm/terran/triton-turret.grp b/mpq/unit/cm/terran/triton-turret.grp new file mode 100644 index 00000000..9492b7f5 Binary files /dev/null and b/mpq/unit/cm/terran/triton-turret.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 9c16797c..3eaa9526 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 b3d60e8e..c61eb76c 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 589f7f6f..178bf1f1 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 d99577aa..895f9280 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index 07e68a1b..57799dd2 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -9,8 +9,14 @@ - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! ## Bugfixes -**Gameplay:** +- **Gameplay:** + - Fixed failure to create **Facade**, **Mantle**, **Apothecary**, and addons for **Captaincy** and **Iron Foundry** at right-most edge (r. Newt, c. DF) - Enabled **Burrow** for **Kethrostalor** +- **Audiovisuals:** + - Fixed shield overlay error for **Aspirant** (r. TheBeaver99) + - Fixed bad building preview for **Future Station** + - Prevented **Arhaun** from turning improperly while the turret still had a target + - Fixed offset SFX for **Gorgrokor** death, **Kethrostalor** weapon SFX, and **Ultrokor** corpse consumption ## Audiovisuals - New birth animation for **Kethrostalor** @@ -35,6 +41,8 @@ - HP 80 » 100 - [Cyclops (Futurist)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops-futurist): - HP 110 » 120 +- **NEW:** [Triton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/triton): + - Specialist walker with Lobotomizing active ability; Trained from Mantle ## Protoss - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 78f5c20f..cba8450b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ