diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 585f943b..f33258da 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 56b10af4..8aa7f483 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -629,7 +629,7 @@ Abutment Proscenium Quadriga Landlock (Christmas) -Extended Flingy #423 +Serathiel Extended Flingy #424 Extended Flingy #425 Extended Flingy #426 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 66a02b46..ce637f04 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 2c818684..6fbb70c1 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 cfe93888..9729cf51 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2229,10 +2229,10 @@ Quadriga Shadow Quadriga Engines Quadriga Afterburners Landlock (Christmas) -Extended Image #1229 -Extended Image #1230 -Extended Image #1231 -Extended Image #1232 +Serathiel +Serathiel Shadow +Serathiel Engines +Divine Discipline Field Extended Image #1233 Extended Image #1234 Extended Image #1235 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 89bacedb..b6e72a1f 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 7f2d0d9b..ec97ab86 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -10,8 +10,8 @@ Attack Attack (Obscured) Attack Unit (Normal) Attack In Range -Rematerialize (Askosi) -Rapid Rendezvous (Askosi) +Use Ability (Rematerialize) +Use Ability (Rapid Rendezvous) Attack Move Building Is Being Infested Nothing 1 (Unused) @@ -26,7 +26,7 @@ Nothing 3 (Unused) Drone Start Mutate Drone Mutate Use Ability (Infest 1) -Use Ability (Infest 2) +Use Ability (Infest 2) unused Infest (Queen) Build (SCV) Build (Probe) @@ -111,15 +111,15 @@ Cloak Decloak Unload Unit (Transport) Move&Unload Unit (Transport) -Use Ability (Yamato Gun) -Use Ability On Obscured (Yamato Gun) +Use Ability (Yamato Cannon) +Use Ability Obscured (Yamato Cannon) Use Ability (Lobotomy Grenade) Burrow Idle (Burrowed) Unburrow -Use Ability (Dark Swarm) +Use Ability (Carapace Swarm) Use Ability (Parasite) -Use Ability (Spawn Broodling) +Use Ability (Divine Discipline) Use Ability (Hijack) Unknown Idle (Nuclear Silo) @@ -135,16 +135,16 @@ Script (Right-Click Action) Attack Unit (Infested Terran) Attack Ground (Infested Terran) Hold Position (Suicide Units) -Use Ability (Recall) +Use Ability (Dimensional Recall) Teleport To Location (Freezes the casting unit) -Use Ability (Scanner Sweep) +Use Ability (Scanner Sweep) unused Idle (Scanner Sweep) Use Ability (Defensive Matrix) Use Ability (Psionic Storm) Use Ability (Irradiate) Use Ability (Plague) Use Ability (Consume) -Use Ability (Ensnare) +Use Ability (Rejoinder of Service) Use Ability (Stasis Field) Use Ability (Hallucination) Script (Hallucination) @@ -173,17 +173,17 @@ Attack (Trap) Enable Doodad Disable Doodad Warp In (Unused) -Idle (Medic) +Idle (Cleric) Use Ability (Heal) -Move (Medic) -Hold Position&Heal (Medic) -Return To Idle After Heal +Move (Cleric) +Hold Position & Heal (Cleric) +Return To Idle After Heal (Cleric) Use Ability (Through the Looking Glass) Use Ability (Disruption Web) Use Ability (Tyranny) Dark Archon Meld Use Ability (Salvage) -Use Ability (Optical Flare) +Use Ability (Aural Assault) Use Ability (Maelstrom) Move (Junk Yard Dog) Fatal diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index dc976f66..dec49c5a 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 72436d30..19012f51 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1080,8 +1080,8 @@ Abutment Proscenium Quadriga Landlock (Christmas) -Extended Sprite #566 -Extended Sprite #567 +Serathiel +Divine Discipline Field Extended Sprite #568 Extended Sprite #569 Extended Sprite #570 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 27078c1c..899a1df3 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 f377b92c..762f1f86 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -8,9 +8,9 @@ Defensive Matrix (Azazel) Irradiate (Seraph) Yamato Cannon (Magnetar) Rapid Rendezvous (Askosi) -Personnel Cloaking (unused) +Divine Discipline (Serathiel) Burrowing (Zerg) -Infestation (unused) +Rejoinder of Service (Serathiel) Ensnaring Brood (Matraleth) Carapace Swarm (Isthrathaleth) Plague (Ogroszaleth) diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 9aeb2242..689aa49c 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 86511013..3101d34a 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -545,7 +545,7 @@ Askosi Petract Askosi Crematorium Askosi Zylode Askosi Astrolabe -Extended Unit #320 +Terran Serathiel (Hecaton) Extended Unit #321 Extended Unit #322 Extended Unit #323 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 02f9e5a3..a1423df1 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 ca0f2379..9e332a94 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -181,7 +181,7 @@ Usko Scrapray (Helion) Skortra Tendril (Skortrith Colony) Ikta Driver (Tirade) Arte Driver (Grandstand) -Through the Looking Glass (Hypnagogue) +Godhand Rockets (Quadriga) Wordsmith Railgun (Silvertongue) Sunsplit Beam (Optecton) Particle Ray (Autocort) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 8d754643..5bfe035e 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 c51411fc..6148f643 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 f5ac86ce..543e8d22 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 86ab2c5d..a5a66874 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 d87b0628..29fbd712 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 b01fdc50..ef21549d 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -330,8 +330,8 @@ Anchor Attack requires:<10> Loaded ranged combatant<0> <0> ¤<3><4>Swarming Omen <2>(passive)<10>Hostiles afflicted by the Zoryusthaleth's attacks grant 33% increased movement speed to any of the Zoryusthaleth's allies within 10 range.<0> <0> -<0> -<0> +d<3><4>Divine Discipline <1>(<3>D<1>)<10>Creates an alchemical field at the target location. Allies within the field gain 25% increased attack speed, while enemies within the field suffer 25% reduced attack speed.<0> +d<3><4>Rejoinder of Service <1>(<3>D<1>)<10>Augments the combatant for 5 seconds, empowering their attacks to ignore armor.<10>If a combatant dies while under this effect, all hostiles within its vision range are pulled towards it by 2 range.<0> t<3><4>Inject Stimpack <1>(<3>T<1>)<10>Take a dangerous injection that deals 5 damage. After a 1.5 second delay, gain 75% movement speed and 100% attack speed for 7.5 seconds.<0> e<3><4>Lay Lobotomy Mines <1>(<3>E<1>)<10>Places a Lobotomy Mine at the target site. Lobotomy Mines stun and slow targets that trip them.<0> e<3><4>Lay Tartarus Mines <1>(<3>E<1>)<10>Places a Tartarus Mine at the target site. Tartarus Mines incinerate and rend the armor of targets that trip them.<0> @@ -1499,8 +1499,8 @@ Olympian requires:<10> Guildhall<0> Autocrat requires:<10> Guildhall<0> Anticthon requires:<10> Biotic Bastion<0> Aion requires:<10> Biotic Bastion<0> -<0> -<0> +z<1><4>Build Serathiel <1>(<3>Z<1>)<10>Vanguard specialist craft.<0> +Serathiel requires:<10> Commandment<0> <0> Expansion Zerg Campaign Area Town<0> <0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 00f72d33..6696947b 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 3d549c10..d61c2c08 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -61,6 +61,8 @@ military vulture_hecaton = 506 military madrigal_hecaton_furia = 508 military valkyrie_hecaton = 520 military quadriga = 541 +military serathiel = 547 +@spellcaster(serathiel) # Protoss factional units military adherent = 400 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 19dfe4b8..d50aab5f 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 28bb570c..2cda70e0 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 4d6dee86..03bc3b4f 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -20502,4 +20502,69 @@ QuadrigaWalking: QuadrigaWalkingToIdle: orderdone 64 - goto TrojanLocal00 \ No newline at end of file + goto TrojanLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2231 Serathiel (cm\faction-t\serathiel.grp) +.headerstart +IsId 841 +Type 14 +Init SerathielInit +Death SerathielDeath +GndAttkInit SerathielGndAttkToIdle +AirAttkInit SerathielGndAttkToIdle +Unused1 SkryrokorLocal00 +GndAttkRpt SerathielGndAttkToIdle +AirAttkRpt SerathielGndAttkToIdle +CastSpell SerathielCastSpell +GndAttkToIdle SerathielGndAttkToIdle +AirAttkToIdle SerathielGndAttkToIdle +Unused2 [NONE] +Walking SerathielWalking +WalkingToIdle SerathielGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 SerathielCastSpell +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SerathielInit: + imgulnextid 0 42 # Serathiel Shadow (cm\faction-t\serathiel-shadow.grp) + playfram 0x00 + goto SerathielGndAttkToIdle + +SerathielGndAttkToIdle: + setvertpos 1 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto SerathielGndAttkToIdle + +SerathielDeath: + playsnd 257 # Terran\PHOENIX\TPhDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium + wait 1 + end + +SerathielLocal00: + wait 125 + goto SerathielLocal00 + +SerathielCastSpell: + wait 1 + castspell + sigorder 2 + gotorepeatattk + goto SerathielGndAttkToIdle + +SerathielWalking: + setvertpos 0 + imgol 2233 0 0 # Serathiel Engines (cm\terran\serathiel-engine.grp) + goto SerathielLocal00 \ No newline at end of file diff --git a/mpq/unit/cm/faction-t/serathiel-divine-discipline.grp b/mpq/unit/cm/faction-t/serathiel-divine-discipline.grp new file mode 100644 index 00000000..1cd3353c Binary files /dev/null and b/mpq/unit/cm/faction-t/serathiel-divine-discipline.grp differ diff --git a/mpq/unit/cm/faction-t/serathiel-engine.grp b/mpq/unit/cm/faction-t/serathiel-engine.grp new file mode 100644 index 00000000..0b546251 Binary files /dev/null and b/mpq/unit/cm/faction-t/serathiel-engine.grp differ diff --git a/mpq/unit/cm/faction-t/serathiel.grp b/mpq/unit/cm/faction-t/serathiel.grp new file mode 100644 index 00000000..95e5bf74 Binary files /dev/null and b/mpq/unit/cm/faction-t/serathiel.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 4e6634a3..919b0cc1 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 9bded8c1..a00df190 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 72033d9f..1bd911d1 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 e66abd4d..785bd95a 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 8750e4d1..0199bf14 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -29,7 +29,8 @@ - Prevented **Anodyne Annex** from applying to allied units (r. Moonpaw) - **Audiovisual** - Fixed missing construction SFX for **Ogun** - - Corrected Herald wireframe (r. TheBeaver99) + - Corrected **Olympian Titan's Fist** weapon range (r. GreenEggs'NSpam) + - Corrected **Herald** wireframe (r. TheBeaver99) - Corrected tooltip for **Corpse Cocoon** (r. Concealed Organic) ## Audiovisuals @@ -63,7 +64,7 @@ - Armor 2 » 1 - Death and revive animations vastly lengthened - *Reducing stackability* -- [Autocrat](): +- [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): - Death and revive animations vastly lengthened - *Reducing stackability* - [Dilettante](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/dilettante): @@ -83,6 +84,10 @@ - *Slight nudge-back to first-unit timings in bio openers.* - [Tencendur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tencendur): - HP 450 » 600 +- **NEW:** [Quadriga](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/quadriga): + - Factional **Valkyrie** replacement: reinforced gunboat for the **Golden Republic** +- **NEW:** [Serathiel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/serathiel): + - Factional **Seraph** replacement: combat specialist for the **Hecaton Coalition** ## Zerg - **Adrenal Frenzy:** diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 57c61f48..b178253d 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ