diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 098c07fe..c0ea762a 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 2e447300..1cef7cfe 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 147bd22d..b37cee6a 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 48657279..af2e9954 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index b3c285f0..eacd4a0c 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4297,12 +4297,12 @@ Cyclops (Futurist) Weaponfire 01 Cyclops (Futurist) Weaponfire 02 Cyclops (Futurist) Weaponfire 03 Cyclops (Futurist) Weaponfire 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Alzurokor Weaponhit 01 +Alzurokor Weaponhit 02 +Alzurokor Weaponhit 03 +Helion Weaponfire 01 +Helion Weaponfire 02 +Helion Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 7c8ee2c8..cc75845d 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4296,4 +4296,10 @@ cm\a\_building\conduit-wht-01.wav cm\f-t\cyclops-futurist\wf-01.wav cm\f-t\cyclops-futurist\wf-02.wav cm\f-t\cyclops-futurist\wf-03.wav -cm\f-t\cyclops-futurist\wf-04.wav \ No newline at end of file +cm\f-t\cyclops-futurist\wf-04.wav +cm\f-z\alzurokor\wh-01.wav +cm\f-z\alzurokor\wh-02.wav +cm\f-z\alzurokor\wh-03.wav +cm\a\helion\wf-01.wav +cm\a\helion\wf-02.wav +cm\a\helion\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 8a22ed7b..f6758dbe 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index ceb482ae..ae79288e 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 2def2159..822cd20b 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -148,7 +148,7 @@ Zerg Surkith Cesiant Terran Guildhall Terran Striga Zerg Excisant -Terran Luminary (Golden Republic) +Terran Luminary (Golden) Terran Siren Zerg Othstol Oviform Zerg Tethvith Swamp @@ -208,7 +208,7 @@ Right Upper Level Door Left Pit Door Right Pit Door Terran Sentinel -Terran Tarasque (Nydus Trinity) +Terran Tarasque (Nydus) Terran Anticthon Zerg Kethraj Keep Terran Atelier @@ -411,7 +411,7 @@ Ackmed Terran Cyclops (Futurist) Protoss Zealot (Starbound) Protoss Ecclesiast (Khalendric Knights) -Terran Harakan (Golden Republic) +Terran Harakan (Golden) Protoss Cicatus (Starbound) Zerg Inzorthrokor (Imicren) Volatile Egg @@ -429,8 +429,8 @@ Terran Facade Terran Savant (Power Siphon) Askosi Landlock Protoss Dracadin (Order) -Terran Blackjack (Golden Republic) -Terran Eidolon (Nydus Trinity) +Terran Blackjack (Golden) +Terran Eidolon (Nydus) Terran Tiangou (Base) Tiangou Turret Terran Maverick (Futurist) @@ -539,7 +539,7 @@ Zerg Overmind (The Fall) Askosi Avatar Askosi Abutment Askosi Proscenium -Terran Quadriga (Golden Republic) +Terran Quadriga (Golden) Askosi Thaumalogue Askosi Petract Askosi Crematorium @@ -612,7 +612,7 @@ Forerunner Vicere Forerunner Machinamentum Big Infested Kerrigan Raynor Vulture -Duke Battlecruiser +Duke Minotaur Askosi Scralia Zerg Rozirokor (Imicren) Bloodsummon Thrombocyte @@ -627,12 +627,12 @@ Bloodsummon Acqui Zerg Alzurokor (Imicren) Zerg Hydrokor (Goszirith) Protoss Gladius (Order) -Terran Eidolon (Golden Republic) +Terran Eidolon (Golden) Zerg Zethalisk (Orkoti) Bloodsummon Nihilist -Extended Unit #405 -Extended Unit #406 -Extended Unit #407 +Faction Selection Askosi +Terran Fleshthief (Nydus) +Forerunner Lumen Extended Unit #408 Extended Unit #409 Extended Unit #410 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 0563cfe7..1e14e2c5 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 c306d1f7..8a38f4fc 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -255,52 +255,52 @@ C-10 Canister Rifle (Kerrigan) Claws (Kerrigan) None (new) Corto Railgun (Cutlass) -Extended Weapon #128 -Extended Weapon #129 -Extended Weapon #130 -Extended Weapon #131 -Extended Weapon #132 -Extended Weapon #133 -Extended Weapon #134 -Extended Weapon #135 -Extended Weapon #136 -Extended Weapon #137 -Extended Weapon #138 -Extended Weapon #139 -Extended Weapon #140 -Extended Weapon #141 -Extended Weapon #142 -Extended Weapon #143 -Extended Weapon #144 -Extended Weapon #145 -Extended Weapon #146 -Extended Weapon #147 -Extended Weapon #148 -Extended Weapon #149 -Extended Weapon #150 -Extended Weapon #151 -Extended Weapon #152 -Extended Weapon #153 -Extended Weapon #154 -Extended Weapon #155 -Extended Weapon #156 -Extended Weapon #157 -Extended Weapon #158 -Extended Weapon #159 -Extended Weapon #160 -Extended Weapon #161 -Extended Weapon #162 -Extended Weapon #163 -Extended Weapon #164 -Extended Weapon #165 -Extended Weapon #166 -Extended Weapon #167 -Extended Weapon #168 -Extended Weapon #169 -Extended Weapon #170 -Extended Weapon #171 -Extended Weapon #172 -Extended Weapon #173 +Elxe Twinshot (Insurant) +Apathetic Sermon (Nihilist) +Leopold Cannon (Broadside) +Sentinel Beam (Ferrum) +Sentinel Beam (Chalyb) +Sentinel Boltbeam (Circitor) +Enforcer Rift-Rocket (Exigo) +Champion Stormbeam (Vicere) +Phase Claws (Cicatus) +Phase Blades (Zealot Starbound) +Ondo Moonbeam (Ghostwrit) +Rotating Blaster (Renesair) +Slice Cannon (Simulacrum Astral) +Garvrol Claws (Garvrokor) +Biotic Wingblades (Akreno) +Horlain Chemthrower (Camazotz) +Hydrok Claws (Hydrokor) +Spewing Spores (Zethalor) +Embracing Mandibles (Alzurokor) +Azgok Beastblades (Zonguard) +Agturrik Beaststick (Zonguard) +Bladed Appendage (Rozirokor) +Inqo Scaleshot (Alacyne) +Alru Driver (Phontis) +Kalgolok Beaststick (Tortare) +Onji Driver (Iconoclast) +Ognirrius Beaststick (Paraclete) +Oldu Tripshard (Silversoul) +Emto Moonbeam (Histrion) +Reforming Carbine (Avatar) +Irko Octorshard (Endbore) +Ofra Ashray (Limire) +Reactive Cells (Thrombocyte) +Fragmentation Barrage (Raynor Vulture) +Asterion Laser Battery (Duke Minotaur) +Ardi Tripshot (Elgird) +Ascending Blaster (Ecclesiast Khalendric) +Lukankazi Railguns (Arquebus) +Omen Blade (Vestige) +Magnate's Maw (Stroluum) +Lobotomy Mines (Vulture) +Piety Wards (Cleric Futurist) +Tartarus Mines (Vulture Hecaton) +Goremasts (Vulture Upstart) +Eyelets (Proselyte) +Alko Ashgun (Scralia) Extended Weapon #174 Extended Weapon #175 Extended Weapon #176 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index b2dc8591..62c26508 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 8cc15da9..f9b5242c 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 a7889e2c..85f77446 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 772d97d4..b4ba7d61 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -539,7 +539,7 @@ a<1><4>Build Paladin <1>(<3>A<1>)<10>Artillery walker.<0> ¤<3><4>Multi-Attack V <2>(passive)<10>This combatant's primary weapon can fire at up to five targets.<0> ¤<3><4>Multi-Attack III <2>(passive)<10>This combatant's primary weapon can fire at up to three targets.<0> x<1><4>Build Hadron <1>(<3>X<1>)<10>Enables Hippogriffs and Phoboses.<0> -1<0><4>Select Faction 1 <1>(<3>1<1>)<10><2>Orion Imperium, Divine Primacy, Ataltreth Tendril<0> +1<0><4>Select Faction 1 <1>(<3>1<1>)<10><2>Orion Imperium<0> ¤<3><4>Offset: Linear <2>(passive)<10>This combatant's weapon fires its projectiles in a line pattern.<0> f<1><4>Build Hippogriff <1>(<3>F<1>)<10>Siege corvette.<0> ¤<3><4>Empathy Core <2>(passive)<10>Each time the Analogue is hit by an attack, it expends 5 energy. If they survive the attack, they clone it as a phantom strike, retaliating against their attacker for half damage.<0> @@ -640,16 +640,16 @@ r<1><4>Warp in Lattice <1>(<3>R<1>)<10>Light robotic production.<0> Cikralisk requires:<10> Mutath Spire<0> a<1><4>Warp in Ancestral Archives <1>(<3>A<1>)<10>Core disciple production.<0> s<1><4>Warp in Stargate <1>(<3>S<1>)<10>Core stellar production.<0> -2<0><4>Select Faction 2 <1>(<3>2<1>)<10><2>Hecaton Coalition, Order of the Sacred Saber, Imicren Tendril<0> +2<0><4>Select Faction 2 <1>(<3>2<1>)<10><2>Hecaton Coalition<0> d<1><4>Warp in Synthetic Synod <1>(<3>D<1>)<10>Absorbing robotic production.<0> -3<0><4>Select Faction 3 <1>(<3>3<1>)<10><2>Futurist Federation, Khalendric Knights, Orkoti Tendril<0> -4<0><4>Select Faction 4 <1>(<3>4<1>)<10><2>Golden Republic, Starbound, Goszirith Tendril<0> +3<0><4>Select Faction 3 <1>(<3>3<1>)<10><2>Futurist Federation<0> +4<0><4>Select Faction 4 <1>(<3>4<1>)<10><2>Golden Republic<0> c<1><4>Build Ministry <1>(<3>C<1>)<10>Town center and worker production.<0> r<1><4>Build Reservoir <1>(<3>R<1>)<10>Vespene processor.<0> b<1><4>Build Stockade <1>(<3>B<1>)<10>Infantry production.<0> e<1><4>Build Atlas <1>(<3>E<1>)<10>Tier 2 tech center.<0> t<1><4>Build Watchdog <1>(<3>T<1>)<10>Anti-air tower.<0> -5<0><4>Select Faction 5 <1>(<3>5<1>)<10><2>Nydus Trinity, Astral Omen, Zorthos Tendril<0> +5<0><4>Select Faction 5 <1>(<3>5<1>)<10><2>Nydus Trinity<0> e<1><4>Build Anchor <1>(<3>E<1>)<10>Infantry garrison.<0> f<1><4>Build Fulcrum <1>(<3>F<1>)<10>Vehicle production.<0> a<1><4>Build Starport <1>(<3>A<1>)<10>Spacecraft production.<0> @@ -1015,8 +1015,8 @@ t<1><4>Morph into Alzurokor <1>(<3>T<1>)<10>Subjugation strain.<0> Alzur Aspect requires:<10> Ulgorg Cavern<0> h<1><4>Morph into Hydrokors <1>(<3>H<1>)<10>Swift melee strain.<0> Hydrokor requires:<10> Hydrith Den<0> -<0> -<0> +t<1><4>Meld Scralia <1>(<3>T<1>)<10>Assault craft.<0> +Scralia Requires:<10> Gauntlet<0> Bloodsummon Stigmata<0> <0> Bloodsummon Sacrament<0> @@ -1162,24 +1162,24 @@ d<1><4>Train Blackguard <1>(<3>D<1>)<10>Mechanized sniper.<0> y<0><4>Build Addon <1>(<3>Y<1>)<0> <0> Askosi Structure Bolting<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> +1<0><4>Select Faction 1 <1>(<3>1<1>)<10><2>Inoa Scatterguard<0> +2<0><4>Select Faction 2 <1>(<3>2<1>)<10><2>Sons of Ash<0> +3<0><4>Select Faction 3 <1>(<3>3<1>)<10><2>Unimplemented<0> +4<0><4>Select Faction 4 <1>(<3>4<1>)<10><2>Unimplemented<0> +5<0><4>Select Faction 5 <1>(<3>5<1>)<10><2>Unimplemented<0> +6<0><4>Select Faction 6 <1>(<3>6<1>)<10><2>Unimplemented<0> +1<0><4>Select Faction 1 <1>(<3>1<1>)<10><2>Divine Primacy<0> +2<0><4>Select Faction 2 <1>(<3>2<1>)<10><2>Order of the Sacred Saber<0> +3<0><4>Select Faction 3 <1>(<3>3<1>)<10><2>Khalendric Knights<0> +4<0><4>Select Faction 4 <1>(<3>4<1>)<10><2>Starbound<0> +5<0><4>Select Faction 5 <1>(<3>5<1>)<10><2>Astral Omen<0> +6<0><4>Select Faction 6 <1>(<3>6<1>)<10><2>Unimplemented<0> +1<0><4>Select Faction 1 <1>(<3>1<1>)<10><2>Ataltreth Tendril<0> +2<0><4>Select Faction 2 <1>(<3>2<1>)<10><2>Imicren Tendril<0> +3<0><4>Select Faction 3 <1>(<3>3<1>)<10><2>Goszirith Tendril<0> +4<0><4>Select Faction 4 <1>(<3>4<1>)<10><2>Orkoti Tendril<0> +5<0><4>Select Faction 5 <1>(<3>5<1>)<10><2>Zorthos Tendril<0> +6<0><4>Select Faction 6 <1>(<3>6<1>)<10><2>Unimplemented<0> <0> <0> <0> @@ -1242,7 +1242,7 @@ Engram requires:<10> Advanced Warp<0> g<1><4>Build Ogun <1>(<3>G<1>)<10>Sturdy constructor.<0> Talos requires:<10> Quarry<0> t<1><4>Build Talos <1>(<3>T<1>)<10>Airborne worker.<0> -<0> +Mason requires:<10> Quarry<0> ¤<3><4>Deathless Procession <2>(passive)<10>This combatant gains 25% movement speed while its shields hold.<0> a<3><4>Nanorepair <1>(<3>A<1>)<10>Heals a target ground ally for 9 HP per second. While being healed by a Cleric, the ally gains +2 armor.<0> x<1><4>Warp in Engram <1>(<3>X<1>)<10>Heavy tower.<0> @@ -1811,3 +1811,1189 @@ e<3><4>Sublime Shepherd <2>(passive)<10>All allies within 6 range of the source <0> e<3><4>Cinder Mode <1>(<3>E<1>)<10>Switches forms, gaining 25% bonus attack speed and 2 armor, while disabling movement.<0> e<0><4>Tank Mode <1>(<3>E<1>)<10>Returns the Matador's weapon, armor, and mobility to normal.<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +Gauss Rifle<0> +Javelin Cannons<0> +Coroner Rifle<0> +Charon Rifle<0> +Fragmentation Grenade<0> +Haymaker Autogun<0> +Spider Mines<0> +Twin Autocannons<0> +Contender Missiles<0> +Danaan Autogun<0> +Crusader Missile Salvo<0> +Arclite Cannon<0> +Fusion Battery<0> +Fusion Cutter<0> +Fusion Cutter<0> +Monogun<0> +Burst Lasers<0> +Perdition Barrage<0> +Artifice Battery<0> +Asterion Laser Battery<0> +Gauss Pistols<0> +Furia Missiles<0> +Imperioso Missiles<0> +Artax Cannon<0> +Sunchaser Missile Salvo<0> +Flamethrower<0> +Twin Railguns<0> +Arclite Shock Cannon<0> +Monstrous Maw<0> +Longbolt Missiles<0> +Yamato Cannon<0> +Missile Strike<0> +Lobotomy Grenade<0> +Psi Assault<0> +Irradiate<0> +Zethrok Claws<0> +Vorvrok Claws<0> +Vestigial Strike<0> +Needle Spines<0> +Erebol Shock Cannon<0> +Kaiser Blades<0> +Screaming Venom<0> +Toxic Spores<0> +Spines<0> +Spines<0> +Plasmid Spores<0> +Acid Spore<0> +Serrated Cleavers<0> +Glave Wurm<0> +Dispatch Pistols<0> +Corrosive Acid<0> +Jupiter Driver<0> +Seeker Spores<0> +Subterranean Tentacle<0> +Skittering Spores<0> +Plasma Metamorphosis<0> +Parasitic Excision<0> +Twintorch<0> +Screaming Venom<0> +Carapace Swarm<0> +Plague<0> +Acid Barrage<0> +Particle Beam<0> +Particle Beam<0> +Phase Blades<0> +Pulse Blaster<0> +Phase Disruptor<0> +Plasma Flurry<0> +Phase Cannon<0> +Potentium Cannon<0> +Psionic Shockwave<0> +Plasma Barrage<0> +Phase Signifier<0> +Photon Blasters<0> +Plasma Missiles<0> +Aeon's Madness<0> +Plasma Torpedo<0> +Aruo Twinshot<0> +Neutron Cannon<0> +Pulse Cannons<0> +Prismatic Cannon<0> +Swarming Spores<0> +Inoa Twinaxe<0> +Stasis Field<0> +Psionic Storm<0> +Hollowed Glaves<0> +Phase Spear<0> +Harrying Talons<0> +Discoid Railgun<0> +Electromagnetic Explosion<0> +Celestial Cannons<0> +Intervention Missiles<0> +Sovrol Spores<0> +Flak Cannons<0> +Argos Laser Batteries<0> +Sowing Spines<0> +Charybdal Rifle<0> +Astral Blaster<0> +Dauntless Disruption Cannon +Phase Cleaver<0> +Neutron Flare<0> +Fervent Blaster<0> +Acrid Barbs<0> +Halo Rockets<0> +Corrosive Spores<0> +Maledictus<0> +Galactic Weaver<0> +Hallucination<0> +Maelstrom<0> +Subterranean Spines<0> +Piercing Spines<0> +Warp Blade<0> +Prismatic Blaster<0> +Phase Lances<0> +Ray of Agony<0> +Iconoclast's Flurry<0> +Eminence Rifle<0> +Viscous Acid<0> +Phase Blaster<0> +Dispersive Salvo<0> +Harpoon Railgun<0> +Aural Assault<0> +Ospo Twinshard<0> +Titan's Fist<0> +Mountain Gun<0> +Jackson Cannon<0> +Elre Scaleshot<0> +Orli Mallet<0> +Final Hour<0> +Hammerfall Beacon<0> +None<0> +Icarus Missiles<0> +Litany Cannons<0> +Projection Saber<0> +Searing Venom<0> +Hedon Cannon<0> +Accelerated Plasmid<0> +Encircling Mirror<0> +Fading Bioplasma<0> +Event Horizon<0> +Emergency Detonation<0> +Newtonian Shock Cannon<0> +Energized Bioplasma<0> +Gosvil Spines<0> +Neutron Saber<0> +Venemous Contagion<0> +Brutish Tendrils<0> +Cerberus Railgun<0> +Vapid Blaster<0> +Khaydarin Ray<0> +Blindside Rockets<0> +Twinstrike Flamethrowers<0> +Bisecting Blades<0> +Bones of Reflection<0> +Orma Scrapray<0> +Ersa Driver<0> +Chimera Cannons<0> +Booming Blast<0> +Pegasus Missiles<0> +Lazarus Salvo<0> +Stellar Torch<0> +Acid Salvo<0> +Saber Array<0> +Pungent Spores<0> +Dissolving Sabers<0> +Explosive Spores<0> +Gnashing Tendrils<0> +Rapid Spines<0> +Fusion Saw<0> +Knockout Drivers<0> +Pharoah Cannons<0> +Abaddon Flamethrowers<0> +Philistine Salvo<0> +Longinius Cannons<0> +Upstart Rifle<0> +Geometric Rifle<0> +Kaleidoscope Cannon<0> +Cleaving Maw<0> +Spirtil Spores<0> +Usko Scrapray<0> +Skortra Tentacle<0> +Ikta Driver<0> +Arte Driver<0> +Godhand Rockets<0> +Wordsmith Railgun<0> +Sunsplit Beam<0> +Particle Ray<0> +Ironhand Weaver<0> +Angeltear Missiles<0> +Massive Mandible<0> +Apollyoid Conflagration<0> +Plasma Shell<0> +Wicked Incisors<0> +Recycling Blaster<0> +Antimatter Missile<0> +Sparring Saber<0> +Kissing Emoji<0> +Khaydarin Plasma Laser<0> +Ion Cannon<0> +Discoid Railgun<0> +Geometric Rifle<0> +Piety Wards<0> +Cylindrical Blaster<0> +Heirloom Batteries<0> +Nathrok Claws<0> +Calcification<0> +Talismanic Weaver<0> +Remote Hijack<0> +Dispatch Shotgun<0> +Quarternary Rifle<0> +Phase Blade<0> +Signaling Spores<0> +Bottomless Spinestacks<0> +Azanthrok Spew<0> +Omnispores<0> +Contagion Bursts<0> +Angeltear Rockets<0> +Brontes Payload<0> +Flak Cannon<0> +Sensory Overload<0> +Onla Drivers<0> +Corrosive Bioplasma<0> +Korozzet Beastblades<0> +Utso Carbine<0> +Okli Quadshard<0> +Rotating Ray<0> +Ansa Sunshot<0> +Repeating Blaster<0> +Autonomous Ray<0> +Phase Cremator<0> +Sucessive Spines<0> +Rapid Spines<0> +Quazrok Spray<0> +Phase Disruptor<0> +Moonbound Salvo<0> +Revenant Rifle<0> +Gauss Slugger<0> +Needle Spores<0> +Inzor Reflux<0> +Mining Saber<0> +Asoni Carbine<0> +Plegethon Cannon<0> +Homing Spores<0> +Zulu Sidekicks<0> +Staggered Spores<0> +Hydria Cannons<0> +Lobotomy Warhead<0> +Rapid Rendezvous<0> +Micken Melter<0> +Medusa Rifle<0> +Sovrol Claws<0> +Tunneling Maw<0> +Logi Rockets<0> +C-10 Canister Rifle<0> +Claws<0> +None<0> +Corto Railgun<0> +Elxe Twinshot<0> +Apathetic Sermon<0> +Leopold Cannon<0> +Sentinel Beam<0> +Sentinel Beam<0> +Sentinel Boltbeam<0> +Enforcer Rift-Rocket<0> +Champion Stormbeam<0> +Phase Claws<0> +Phase Blades<0> +Ondo Moonbeam<0> +Rotating Blaster<0> +Slice Cannon<0> +Garvrol Claws<0> +Biotic Wingblades<0> +Horlain Chemthrower<0> +Hydrok Claws<0> +Spewing Spores<0> +Embracing Mandibles<0> +Azgok Beastblades<0> +Agturrik Beaststick<0> +Bladed Appendage<0> +Inqo Scaleshot<0> +Alru Driver<0> +Kalgolok Beaststick<0> +Onji Driver<0> +Ognirrius Beaststick<0> +Odlu Triphshard<0> +Emto Moonbeam<0> +Reforming Carbine<0> +Irko Octorshard<0> +Ofra Ashray<0> +Reactive Cells<0> +Fragmentation Barrage<0> +Asterion Laser Battery<0> +Ardi Tripshot<0> +Ascending Blaster<0> +Lukankazi Railguns<0> +Omen Blade<0> +Magnate's Maw<0> +Lobotomy Mines<0> +Piety Wards<0> +Tartarus Mines<0> +Goremasts<0> +Eyelets<0> +Alko Ashgun<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> +<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index dd276506..7c2c17ff 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index b5441969..fa914600 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -37,80 +37,6 @@ military goska = 500 military stroluum = 501 building tuzor = 502 -# Terran factional units -military cohort = 50 -military luminary = 150 -military aspirant = 194 -military tarasque = 210 -military philoc = 328 -military hotshot = 395 -military qilin = 398 -military auriel = 399 -military cyclops_futurist = 410 -military harakan_golden = 413 -military cleric_futurist = 418 -military blackjack_golden = 431 -military eidolon_nydus = 432 -military tiangou = 433 -military maverick_futurist = 435 -military blackguard = 489 -military arhaun = 490 -military cannibal = 496 -military madrigal_hecaton = 504 -military vulture_hecaton = 506 -military madrigal_hecaton_furia = 508 -military valkyrie_hecaton = 520 -military quadriga = 541 -military serathiel = 547 -military goremast = 567 -military broadside = 568 -military vulture_upstart = 570 -military maverick_upstart = 573 -military eidolon_upstart = 575 -military ajax = 576 -military maverick_golden = 580 -military shaman_upstart = 581 -military nuriel = 598 -military phoenix = 599 -military archbishop = 600 -military camazotz = 620 -@spellcaster(serathiel) - -# Protoss factional units -military adherent = 400 -military extatus = 401 -military zealot_starbound = 411 -military ecclesiast_khalendric = 412 -military cicatus = 414 -military renesair = 423 -military ashguard = 424 -military dracadin_order = 430 -military manifold_starbound = 437 -military simulacrum_astral = 522 -military warlock = 523 -military simulacrum_khalendric = 621 -military idol_khalendric = 622 -military cabalist_starbound = 623 - -# Zerg factional units -military nathrelisk = 402 -military iziralisk = 403 -military inzorthrokor = 415 -military quazrokor = 422 -military lakizilisk_zorthos = 425 -military hydralisk_orkoti = 436 -military yblyleth = 438 -military azanthrokor = 511 -military sovrokor = 519 -military garvrokor = 521 -military zethalor = 559 -military scrylyleth = 560 -military zoltorokor = 604 -military rozirokor = 616 -military alzurokor = 626 -military hydrokor = 627 -military zethalisk = 630 - # Terran military units military maverick = 0 military eidolon = 1 @@ -186,6 +112,45 @@ military jester = 301 military madrigal_furia = 381 military triton = 512 +# Terran factional units +military cohort = 50 +military luminary = 150 +military aspirant = 194 +military tarasque = 210 +military philoc = 328 +military hotshot = 395 +military qilin = 398 +military auriel = 399 +military cyclops_futurist = 410 +military harakan_golden = 413 +military cleric_futurist = 418 +military blackjack_golden = 431 +military eidolon_nydus = 432 +military tiangou = 433 +military maverick_futurist = 435 +military blackguard = 489 +military arhaun = 490 +military cannibal = 496 +military madrigal_hecaton = 504 +military vulture_hecaton = 506 +military madrigal_hecaton_furia = 508 +military valkyrie_hecaton = 520 +military quadriga = 541 +military serathiel = 547 +military goremast = 567 +military broadside = 568 +military vulture_upstart = 570 +military maverick_upstart = 573 +military eidolon_upstart = 575 +military ajax = 576 +military maverick_golden = 580 +military shaman_upstart = 581 +military nuriel = 598 +military phoenix = 599 +military archbishop = 600 +military camazotz = 620 +@spellcaster(serathiel) + # Terran buildings building mason = 7 # @@ -298,6 +263,22 @@ military bulwark = 331 military monogram = 348 military vassal = 360 +# Protoss factional units +military adherent = 400 +military extatus = 401 +military zealot_starbound = 411 +military ecclesiast_khalendric = 412 +military cicatus = 414 +military renesair = 423 +military ashguard = 424 +military dracadin_order = 430 +military manifold_starbound = 437 +military simulacrum_astral = 522 +military warlock = 523 +military simulacrum_khalendric = 621 +military idol_khalendric = 622 +military cabalist_starbound = 623 + # Protoss buildings building scribe = 64 # @@ -401,6 +382,25 @@ military rakzilisk = 327 military sasyrvoleth = 407 military skryrokor = 503 +# Zerg factional units +military nathrelisk = 402 +military iziralisk = 403 +military inzorthrokor = 415 +military quazrokor = 422 +military lakizilisk_zorthos = 425 +military hydralisk_orkoti = 436 +military yblyleth = 438 +military azanthrokor = 511 +military sovrokor = 519 +military garvrokor = 521 +military zethalor = 559 +military scrylyleth = 560 +military zoltorokor = 604 +military rozirokor = 616 +military alzurokor = 626 +military hydrokor = 627 +military zethalisk = 630 + # Zerg misc military larva = 35 military larva_egg = 36 @@ -530,6 +530,9 @@ building domain = 579 building lekrot = 596 building hearthshard = 597 +# Askosi factional units +military scralia = 615 + # Forerunner units military ferrum = 605 military chalyb = 606 diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 307d7309..2914a553 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 b803cff1..8fef6a03 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -6491,4 +6491,74 @@ ImpactDissipationOverlayDeath: wait 1 playfram 26 wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2180 Scralia (cm\f-a\scralia.grp) +.headerstart +IsId 75 +Type 21 +Init ScraliaInit +Death ScraliaDeath +GndAttkInit ScraliaGndAttkInit +AirAttkInit ScraliaGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ScraliaGndAttkInit +AirAttkRpt ScraliaGndAttkInit +CastSpell [NONE] +GndAttkToIdle ScraliaGndAttkToIdle +AirAttkToIdle ScraliaGndAttkToIdle +Unused2 [NONE] +Walking ScraliaWalking +WalkingToIdle ScraliaLocal00 +SpecialState1 ScraliaSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +ScraliaInit: + imgulnextid 0 7 # Scralia Shadow (cm\f-a\scralia.grp) +ScraliaGndAttkToIdle: + playfram 0x00 +ScraliaLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ScraliaLocal00 + +ScraliaDeath: + playsndbtwn 1385 1386 # Matador death 01, 02 + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + wait 1 + end + +ScraliaGndAttkInit: + setvertpos 0 + playfram 0x00 + attackwith 1 + playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 + wait 1 + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x00 + gotorepeatattk + goto ScraliaGndAttkToIdle + +ScraliaWalking: + setvertpos 0 +# imgol 225 0 5 # Scralia Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +ScraliaSpecialState1: + playfram 0x00 + wait 12 + goto ScraliaGndAttkToIdle \ No newline at end of file diff --git a/mpq/scripts/iscript_bloodsummon.bin b/mpq/scripts/iscript_bloodsummon.bin index 04271af0..a663e852 100644 Binary files a/mpq/scripts/iscript_bloodsummon.bin and b/mpq/scripts/iscript_bloodsummon.bin differ diff --git a/mpq/scripts/iscript_bloodsummon.txt b/mpq/scripts/iscript_bloodsummon.txt index 80b76b11..4f8ce047 100644 --- a/mpq/scripts/iscript_bloodsummon.txt +++ b/mpq/scripts/iscript_bloodsummon.txt @@ -1180,6 +1180,8 @@ NihilistGndAttkInit: playfram 0x400 playsndbtwn 2536 2538 # Protathalor weaponfire 01, 02, 03 attack + attack + attack wait 1 playfram 0x420 wait 1 diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 253acae3..9b30bdef 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 079aaa89..f5a2d9c3 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -21228,4 +21228,156 @@ CyclopsFuturistGndAttkRpt: CyclopsFuturistGndAttkToIdle: playfram 0x00 wait 1 - goto CyclopsWalkingToIdle \ No newline at end of file + goto CyclopsWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 256 Raynor Vulture (cm\h\raynor-vulture.grp) +.headerstart +IsId 851 +Type 13 +Init RaynorVultureInit +Death RaynorVultureDeath +GndAttkInit RaynorVultureGndAttkInit +AirAttkInit [NONE] +Unused1 RaynorVultureUnused1 +GndAttkRpt RaynorVultureGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle RaynorVultureGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking RaynorVultureWalking +WalkingToIdle RaynorVultureGndAttkToIdle +SpecialState1 RaynorVultureSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +RaynorVultureInit: + imgulnextid 0 7 # Raynor (Vulture) Shadow (cm\h\raynor-vulture.grp) + playfram 0x00 + goto RaynorVultureGndAttkToIdle + +RaynorVultureGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto RaynorVultureGndAttkToIdle + +RaynorVultureDeath: + playsnd 353 # Terran\VULTURE\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 813 0 0 # RaynorVulture Remains + end + +RaynorVultureUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # RaynorVulture revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto RaynorVultureGndAttkToIdle + +RaynorVultureGndAttkInit: + wait 1 + nobrkcodestart + attackwith 1 + playsnd 106 # Bullet\tvuFir00.wav + wait 3 + attackwith 1 + playsnd 106 # Bullet\tvuFir00.wav + wait 3 + attackwith 1 + playsnd 106 # Bullet\tvuFir00.wav + wait 1 + nobrkcodeend + gotorepeatattk + goto RaynorVultureGndAttkToIdle + +RaynorVultureWalking: + playfram 0x00 + setvertpos 0 + imgol 2394 0 0 # Raynor (Vulture) Engines + goto SkryrokorLocal00 + +RaynorVultureSpecialState1: + attackwith 1 + sigorder 1 + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 852 Duke (Minotaur) (terran\BattleCr.grp) +.headerstart +IsId 852 +Type 12 +Init DukeMinotaurInit +Death DukeMinotaurDeath +GndAttkInit DukeMinotaurGndAttkInit +AirAttkInit DukeMinotaurAirAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt DukeMinotaurGndAttkInit +AirAttkRpt DukeMinotaurAirAttkInit +CastSpell DukeMinotaurCastSpell +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 [NONE] +Walking DukeMinotaurWalking +WalkingToIdle MinotaurWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +DukeMinotaurInit: + imgulnextid 0 42 # Duke (Minotaur) Shadow (terran\BattleCr.grp) + playfram 0x00 + goto SkryrokorLocal00 + +DukeMinotaurDeath: + playsnd 177 # Terran\BATTLE\tbaDth00.wav + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 273 0 42 # Terran Building Rubble Small + wait 1 + end + +DukeMinotaurGndAttkInit: + imgol 446 0 0 # Minotaur Attack Overlay (thingy\elbBat.grp) + goto DukeMinotaurLocal00 + +DukeMinotaurLocal00: + wait 1 + attackwith 1 + playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 + gotorepeatattk + goto SkryrokorLocal00 + +DukeMinotaurAirAttkInit: + imgol 446 0 0 # Minotaur Attack Overlay (thingy\elbBat.grp) + goto DukeMinotaurLocal01 + +DukeMinotaurLocal01: + wait 1 + attackwith 2 + playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 + gotorepeatattk + goto SkryrokorLocal00 + +DukeMinotaurCastSpell: + imgolorig 543 # Yamato Gun Overlay (thingy\eycBlast.grp) + goto SkryrokorLocal00 + +DukeMinotaurWalking: + imgol 220 0 0 # Minotaur Engines (thingy\tbaGlow.grp) + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 09c5d204..cb227acc 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 f6772dff..ea6a5891 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -19187,7 +19187,7 @@ SovrokorGndAttkInit: wait 1 nobrkcodestart playfram 0x22 - attackmelee 1 894 # Zerg\Ultra\zulHit00.WAV + attackmelee 3 3835 3836 3837 # Sovrokor weaponhit 01, 02, 03 wait 1 playfram 0x33 wait 1 @@ -19670,7 +19670,7 @@ AlzurokorGndAttkRpt: playfram 0xdd wait 1 playfram 0xcc - playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + playsndbtwn 4299 4301 # Alzurokor weaponhit 01, 02, 03 attackwith 1 wait 2 playfram 0xbb diff --git a/mpq/sound/cm/f-z/alzurokor/wh-01.wav b/mpq/sound/cm/f-z/alzurokor/wh-01.wav new file mode 100644 index 00000000..5ddb6141 Binary files /dev/null and b/mpq/sound/cm/f-z/alzurokor/wh-01.wav differ diff --git a/mpq/sound/cm/f-z/alzurokor/wh-02.wav b/mpq/sound/cm/f-z/alzurokor/wh-02.wav new file mode 100644 index 00000000..97315717 Binary files /dev/null and b/mpq/sound/cm/f-z/alzurokor/wh-02.wav differ diff --git a/mpq/sound/cm/f-z/alzurokor/wh-03.wav b/mpq/sound/cm/f-z/alzurokor/wh-03.wav new file mode 100644 index 00000000..e73d42b9 Binary files /dev/null and b/mpq/sound/cm/f-z/alzurokor/wh-03.wav differ diff --git a/mpq/unit/cm/a/scralia.grp b/mpq/unit/cm/f-a/scralia.grp similarity index 100% rename from mpq/unit/cm/a/scralia.grp rename to mpq/unit/cm/f-a/scralia.grp diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 01141d67..c81427b9 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 adff67a2..904198eb 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 98ef0cb6..55306ce0 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 7dbfd128..759f4d08 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 435648ee..6176bdeb 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -7,290 +7,27 @@ - Continue technical improvements and bugfixes - Further improve audiovisuals - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! +- Join our communities ([Discord](https://discord.com/invite/s5SKBmY) | [Fluxer](https://fluxer.gg/1rebBmBw)), or get in touch with Pr0nogo via email! pr0nogo@fraudsclub.com -# Core - -## User Interface -- Improved server-side desync logging (c. Veeq7) -- Added user-configurable window flash for when another player joins your lobby (c. Jesse) -- Reorganized replay options to `Misc` tab (c. Jesse) -- Added user-configurable Askosi player color preferences +## Core +- **Weapon entries have been extended!** + - With much help from DarkenedFantasies (DF) and Jesse, weapon entries are (finally) virtually-unlimited! Say goodbye to broken tooltips and edge case bugs for several Askosi and factional weapons! + - *Please report any weapon-based oddities you encounter to us via discord/fluxer or email!* +- **Immense improvements have been made to helper and hook wrappers!** + - For the less technically-inclined, this means... more stability! Less desyncs! Easier debugging! + - *Please report any newfound issues you encounter to us via discord/fluxer or email!* ## Bugfixes -- **Stability:** - - Resolved a crash when certain weapons targeted units directly on top of them (r. shopkeeper dog) - - Crashes now generate replays, which can be attached with your bug reports! (c. DF) - - Lardfix: Fixed rare crash from AI attack force handling (c. DF) -- **Gameplay:** - - Group casting now correctly issues orders to selected units in cases where some selected units did not have enough energy for an ability (r. shopkeeper dog) - - *Caveat: Still throws an error message and some abilities will issue move orders to units with insufficient energy* - - **Cyprian**s no longer occasionally freeze when issued move orders between attack orders (r. shopkeeper dog) - - **Cardinal**s can no longer proc Sustaining Sermon on allies (r. shopkeeper dog) - - **Tethzorokor**s no longer fail to hit large enemies from certain angles - - Flying workers and **Dyad**s now use iscript-based movement, removing acceleration and eliminating rare visual and harvesting bugs - - The **Bounty** is no longer a resource drop-off point (r. ConcealedOrganic) - - Flyers can now correctly be loaded into air garrisons (e.g. Askosi Grandstand) - - **Scrapworld: Gold Rush** now correctly accounts for the resource cost of dual- and triple-birth units (r. shopkeeper dog) - - Computer-controlled **Cantavis** now spam **Psionic Storm** casts less frequently - - **Skryokor**s are now appropriately treated as Broodspawn for timed life and incubation purposes (r. jakulangski) - - Lardfix: Protected against rare AI breakage from niche town configurations (c. DF) - - **Nydus Trinity Eidolon**s now correctly regenerate life at a higher rate when cloaked (r. jakulangski) - - **Tencendur**s can now issue load orders - - Traps placed by mine-layers (e.g. **Vulture**) now inherit debuffs (e.g. Infestation) (r. jakulangski) - - Resolved mnemonic hotkey conflict between: - - **Rapid Rendezvous** and **Place Eyelet** (r. Krankendau) - - **Abutment** and **Proscenium** (r. Krankendau) - - **Caphrolosk** and **Kethraj Keep** (r. jakulangski) - - Fixed swapped faction order in `set_faction` crig action for **Goszirith** and **Orkoti** (r. Hamster) -- **Audiovisuals:** - - Resolved various weapon SFX mismatches (r. lolrsk8s) - - Fixed "dead pixels" in Askosi UI - - Corrected **Spraith Cesiant** shadow (r. Mimika) - - Fixed **Endbore** weapon name (r. Concealed Organic) - - Fixed bad gas puff coordinates for Installation Vespene Ridges (r. BtyB) - - Hid `(null)` string on replay playback (c. DF) - - Hid force name display on neutral unit selection (c. DF) -- **User Interface:** - - Fixed lack of options sync for **Askosi** in the random race selector (r. Alexhandr, c. Jesse) - -## Audiovisuals -- New models for: - - Eidolon, Gladius (c. Solstice) - - Valkyrie, Trojan, Amaranth, Atreus, Servitor, Exemplar, Zethrokor, Hydralisk (c. Baelethal) - - Solarion, Steward (c. DeltaCadimus) - - Eidolon (Nydus), Valkyrie (Hecaton), Inzorthrokor (Imicren), Sovrokor (Goszirith), Hydralisk (Orkoti), Iziralisk (Zorthos) - - All new wireframes c. jun3hong! -- Updated models for: - - Vulture, Wraith, Wyvern, Pythean, Sundog, Centaur, Phobos, Hippogriff, Dracadin, Architect, Panoptus (c. Solstice) -- Added engine graphic for Star Sovereign (c. Solstice) -- Updated engine graphics for: - - Mason, Talos, Vulture, Wraith, Ancile, Wyvern, Pythean, Sundog, Centaur, Phobos, Hippogriff -- Updated Askosi UI to be GREEN! (c. DF) -- Updated background graphics for Options and CrownLink Join menus (c. Jesse) -- Added unique shadows for **Vornath Pond**, **Chokral Chaszal** -- Updated selection circle size for **Epigraph** -- New unit responses for: - - **Vicar**, **Conduit** -- New death SFX for: - - Striga (c. Milia) -- New ambient SFX for: - - **Landlock** - -# Balance - -## Neutral -- Neutral garrisons (e.g. the Tencendur on Magnetron): - - Now eject units when taking fatal damage, heal to full life, and become stunned for 10 seconds - - Can only be destroyed if they take fatal damage during the 10 second stun window +- **Audiovisual:** + - Corrected strings for **Izirokor** tech-enable on **Skibact Scab** and **Tethvith Swamp** (r. Mimika) + - **Cyclops (Futurist)** now uses its unique shadow and attack sequence instead of the standard variant's (r. lolrsk8s) ## Terran -- [Shaman](https://cosmonarchy.com/terran/vulture): - - Resource costs 200/200 » 150/150 - - HP 160 » 140 -- [Vulture](https://cosmonarchy.com/terran/vulture): - - Vision range 8 » 7 -- [Phalanx](https://cosmonarchy.com/terran/phalanx): - - HP 240 » 275 - - **Arclite Shock Cannon:** - - Splash radius 16/32/48 » 16/40/64 -- [Aion](https://cosmonarchy/com/terran/aion): - - Transport weight 8 » 12 -- [Wraith](https://cosmonarchy.com/terran/wraith): - - HP 110 » 120 -- [Quarry](https://cosmonarchy.com/terran/quarry/): - - Build time 45 » 35 -- [Palladium](https://cosmonarchy.com/terran/palladium): - - Resource costs 300/150 » 300/100 - - HP 900 » 800 - - Armor 4 » 3 -- [Mantle](https://cosmonarchy.com/terran/mantle): - - Resource costs 200/150 » 250/125 - - HP 1000 » 900 - - Armor 3 » 4 -- [Starport](https://cosmonarchy.com/terran/starport): - - Resource costs 150/225 » 200/150 +- [Treasury](https://cosmonarchy.com/terran/treasury): + - Can now train **Mason**s while a **Quarry** is constructed. -### Terran factions -- [Auriel](https://cosmonarchy.com/terran/auriel): - - **Quarternary Rifle:** - - Weapon cooldown 0.92 » 0.67 -- [Broadside](https://cosmonarchy.com/terran/broadside): - - HP 300 » 335 -- **NEW:** [Camazotz](https://cosmonarchy.com/terran/camazotz): - - **Nydus Trinity:** Harakan replacement. Sustaining infantry. -- **NEW:** [Arquebus](https://cosmonarchy.com/terran/arquebus): - - **Hecaton Coalition:** Cataphract replacement. Incendiary platform. - -## Protoss -- [Artisan](https://cosmonarchy.com/protoss/artisan): - - Movement speed 4.16 » 4 (~4% reduction) -- [Amaranth](https://cosmonarchy.com/protoss/amaranth): - - Vision range 9 7 -- [Atreus](https://cosmonarchy.com/protoss/atreus): - - Resource costs 200/25 » 150/100 - - HP 200 » 160 - - Shields 100 » 60 - - Armor 2 » 3 - - Speed 4.8 » 6 - - **Dauntless Disruption Cannon:** - - Weapon damage 20 » 12 - - Weapon range 7 » 5 - - Attack cooldown 1.25 » 1 - - No longer targets air units - - **Interception** removed - - **NEW: Binding Plasma**, as with **Oscilliant** / **Gladius** -- [Cantavis](https://cosmonarchy.com/protoss/cantavis): - - Build time 33 » 30 - - **Hallucination:** - - Projectile can no longer be intercepted by hostiles -- [Charlatan](https://cosmonarchy.com/protoss/charlatan): - - **Fervent Blaster:** - - Splash radius 12/24/32 » 16/24/32 -- [Mind Tyrant](https://cosmonarchy.com/protoss/mind-tyrant): - - **Malefactor:** - - Tyrannize procs no longer drain energy - - Mind Tyrant must still have energy to proc Tyrannize - - **Maelstrom:** - - Movement speed slow 50% » 66% -- [Idol](https://cosmonarchy.com/protoss/idol): - - **Prismatic Blasters:** - - Splash radius 12/18/24 » 16/24/32 -- [Exemplar](https://cosmonarchy.com/protoss/exemplar): - - Resource costs 300/150 250/150 -- [Warden](https://cosmonarchy.com/protoss/warden): - - Build time 35 » 30 -- [Lattice](https://cosmonarchy.com/protoss/lattice): - - HP 400 » 500 - - Shields 250 » 300 -- [Stargate](https://cosmonarchy.com/protoss/stargate): - - Resource costs 200/200 » 200/150 - -### Protoss factions -- **NEW:** [Simulacrum (Khalendric)](https://cosmonarchy.com/protoss/simulacrum-khalendric): - - **Khalendric Knights:** Simulacrum variant with **Last Orders** (e.g. Aurora) -- **NEW:** [Idol (Khalendric)](https://cosmonarchy.com/protoss/idol-khalendric): - - **Khalendric Knights:** Idol variant with **Signify** (e.g. Hierophant) -- **NEW:** [Vestige](https://cosmonarchy.com/protoss/vestige): - - **Starbound:** Cabalist variant with on-damage cloaking - -## Zerg -- **Bone of Reflection:** - - Armor pen 0 » 1 -- **Corpse Cocoon:** - - Allied corpses now spawn **Rilirokors** for consumed ground units and **Rililisks** for consumed air units -- **Blissful Embrace:** - - Infested units now incubate **Rilirokors** on damage taken (like **Zoryusthaleth**) -- **Plague:** - - Now reduces HP and shield healing by 50% -- [Rililisk](https://cosmonarchy.com/zerg/rililisk): - - **Swarming Spores:** - - Weapon damage 1x5 » 1x4 - - Weapon range 2 » 4 -- [Malkothrokor](https://cosmonarchy.com/zerg/malkothrokor): - - Structure gestation now occurs 50% faster -- [Nathrokor](https://cosmonarchy.com/zerg/nathrokor): - - **Adrenal Frenzy** (movement speed on attack) removed -- [Vorvrokor](https://cosmonarchy.com/zerg/): - - Build time 12 » 15 -- [Liiralisk](https://cosmonarchy.com/zerg/liiralisk): - - Build time 20 » 25 -- [Kalkalisk](https://cosmonarchy.com/zerg/kalkalisk): - - Build time 25 » 30 -- [Protathalor](https://cosmonarchy.com/zerg/protathalor): - - Build time 22 » 25 - - Resource costs 125/50 » 150/75 - - Now two per requisition -- [Mutalisk](https://cosmonarchy.com/zerg/mutalisk): - - Build time 25 » 30 -- [Sovroleth](https://cosmonarchy.com/zerg/sovroleth): - - Now considered a Sire -- [Hydralisk](https://cosmonarchy.com/zerg/hydralisk): - - Build time 20 » 18 - - HP 80 » 100 -- [Bactalisk](https://cosmonarchy.com/zerg/bactalisk): - - Build time 25 » 30 - - HP 120 » 100 -- [Tethzorokor](https://cosmonarchy.com/zerg/tethzorokor): - - Build time 28 » 32 -- [Vithrilisk](https://cosmonarchy.com/zerg/vithrilisk): - - Build time 25 » 30 -- [Ultrokor](https://cosmonarchy.com/zerg/ultrokor): - - Build time 40 » 45 -- [Zobriolisk](https://cosmonarchy.com/zerg/zobriolisk): - - Resource costs 200/100 » 150/75 - - Build time 25 » 35 -- [Zarcavrokor](https://cosmonarchy.com/zerg/zarcavrokor): - - Build time 35 » 40 - - Vision range 9 » 7 - - **Bisecting Blades:** - - Weapon cooldown 0.42 » 0.67 -- [Vornath Pond](https://cosmonarchy.com/zerg/vornath-pond): - - Build time 40 » 50 -- [Skibact Scab](https://cosmonarchy.com/zerg/skibact-scab): - - Resource costs 75/150 » 100/175 - - Build time 45 » 50 - -### Zerg Factions -- [Sovrokor](https://cosmonarchy.com/zerg/sovrokor): - - Now considered a Sire -- **NEW:** [Rozirokor](https://cosmonarchy.com/zerg/rozirokor): - - **Imicren Tendril:** Izirokor replacement. Has Saber Siphon. -- **NEW:** [Alzurokor](https://cosmonarchy.com/zerg/alzurokor): - - **Imicren Tendril:** Ultrokor replacement. Has Captivating Claws and Devouring Instinct. -- **NEW:** [Hydrokor](https://cosmonarchy.com/zerg/hydrokor): - - **Goszirith Tendril:** Hydralisk replacement. Dual-birth melee strain with Mitosis. -- **NEW:** [Zytryleth](https://cosmonarchy.com/zerg/zytryleth): - - **Zorthos Tendril:** Structure mutated from Scrylyleth. Has Omnispores, acts as a town center, and gestates Larvae. - -## Askosi -- **Impact Dissipation:** - - No longer heals - - Now blocks the next weapon attack -- **Ash Heap:** - - Duration 2 seconds » 5 seconds -- [Proselyte](https://cosmonarchy.com/askosi/proselyte): - - Movement speed 5.2 » 5.6 -- [Missionary](https://cosmonarchy.com/askosi/missionary): - - HP 75 » 85 - - **NEW: Accelerated Speech** (passive) - - Gains +2 armor pen when within 2 weapon range of its target -- [Cardinal](https://cosmonarchy.com/askosi/cardinal): - - **Sustaining Sermon:** - - Now heals the proccing Cardinal - - **Rapid Rendevous** removed - - **NEW: Ashbind:** - - Leaps to an enemy target, applying Ash Heap to enemies within 3 range -- [Mimic](https://cosmonarchy.com/askosi/mimic): - - **Scrapworld: Vital Remains** removed - - **Mimicry:** - - Mimicked attacks now apply Scrapworld: Gold Rush -- [Aphorist](https://cosmonarchy.com/askosi/aphorist): - - Resource costs 50/25 » 100/25 -- [Doronin](https://cosmonarchy.com/askosi/doronin): - - Resource costs 225/0 » 175/50 - - Armor 3 » 4 -- [Insurant](https://cosmonarchy.com/askosi/insurant): - - **Elxe Twinshot:** - - No longer attacks air units -- [Rove](https://cosmonarchy.com/askosi/rove): - - HP 90 » 100 - - **Elre Scaleshot:** - - No longer attacks air units -- [Intendent](https://cosmonarchy.com/askosi/intendent): - - Movement speed 4 » 5.2 -- [Endbore](https://cosmonarchy.com/askosi/endbore): - - **Irko Octorshard:** - - Weapon damage 8x10 » 8x8 - - No longer attacks air units -- [Grandstand](https://cosmonarchy.com/askosi/grandstand): - - Resource costs 200/0 » 150/0 -- [Chantry](https://cosmonarchy.com/askosi/chantry): - - Resource costs 75/50 » 75/100 - - Build time 45 » 35 -- [Radix](https://cosmonarchy.com/askosi/radix): - - Build time 65 » 60 -- [Function](https://cosmonarchy.com/askosi/function): - - Resource costs 150/25 » 125/25 - - Build time 75 » 70 -- [Cosmoscope](https://cosmonarchy.com/askosi/comoscope): - - Build time 90 » 75 \ No newline at end of file +## Askosi factions +- **NEW: Sons of Ash** + - Conqueror clergy, set to burn the dead wood. +- **NEW:** [Scralia](https://cosmonarchy.com/askosi/scralia) + - Intendent replacement for Sons of Ash. Short-range assault craft with Booming Blast and Ash Heap. \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fa001508..71791b26 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ