diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 02440fcc..cebb34ed 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 c22418ce..7efb969e 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -714,7 +714,7 @@ Alzurokor (Imicren) Hydrokor (Goszirith) Nihilist Maverick (Golden) -Extended Flingy #508 +Gladius (Order) Extended Flingy #509 Extended Flingy #510 Extended Flingy #511 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 17ef2cf9..17f505a5 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 6f92d11b..f3d0ab76 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 55f5764d..2b9fb4a7 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2467,11 +2467,11 @@ Maverick (Golden) Remains Garvrokor Shadow Garvrokor Birth Garvrokor Remains -Extended Image #1467 -Extended Image #1468 -Extended Image #1469 -Extended Image #1470 -Extended Image #1471 +Mine Restock Overlay +Gladius (Order) +Gladius (Order) Shadow +Gladius (Order) Engine +Gladius (Order) Warp Flash Extended Image #1472 Extended Image #1473 Extended Image #1474 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index e3ec00d9..ab4acffb 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4315,7 +4315,7 @@ Vorvrokor Order Passive 04 Vorvrokor Under Attack 01 Vorvrokor Under Attack 02 Vorvrokor Under Attack 03 -Extended Sound #1 +Mine Restock 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 99663822..0acbce44 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4314,4 +4314,5 @@ cm\z\vorvrokor\yes-03.wav cm\z\vorvrokor\yes-04.wav cm\z\vorvrokor\hlp-01.wav cm\z\vorvrokor\hlp-02.wav -cm\z\vorvrokor\hlp-03.wav \ No newline at end of file +cm\z\vorvrokor\hlp-03.wav +cm\t\mine\restock-01.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 232581fe..704e88a8 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 63e9b840..868bdbbd 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1186,7 +1186,7 @@ Eidolon (Nydus) Remains Morrigan Remains Maverick (Golden) Maverick (Golden) Remains -Extended Sprite #672 +Gladius (Order) Extended Sprite #673 Extended Sprite #674 Extended Sprite #675 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 719923bc..e9ebc292 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index aa908fb6..1bd314fa 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 1a01e2f9..e628bcb9 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -302,7 +302,7 @@ Goremasts (Vulture Upstart) Eyelets (Proselyte) Alko Ashgun (Scralia) Phase Rifle (Maverick Golden) -Extended Weapon #175 +Plasma Flurry (Gladius Order) Extended Weapon #176 Extended Weapon #177 Extended Weapon #178 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index a3454cff..ca9d40df 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index fc4c6dcb..0c28da25 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 0600a096..3793a5a4 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -323,7 +323,7 @@ f<1><4>Bestow Maverick <1>(<3>F<1>)<10>Disciplined infantry.<0> ¤<3><4>Accelerated Speech <2>(passive)<10>While the Missionary is within 2 range of its target, it gains +2 armor penetration.<0> ¤<3><4>Flanking Spines <2>(passive)<10>When targeting debuffed enemies, Almaksalisk attacks ignore armor.<0> Anchor Attack requires:<10> Loaded ranged combatant<0> -<0> +¤<3><4>Fabrication <2>(passive)<10>Raynor's Vulture automatically restocks one Spider Mine every 10 seconds.<0> e<3><4>Lay Spider Mines <1>(<3>E<1>)<10>Places a Spider Mine at the target site. Spider Mines explode on hostiles that trip them, dealing significant splash damage.<0> ¤<3><4>Autophagy <2>(passive)<10>On death, Vilgorokors transform into Vilgoleths and immediately spawn 2 Rilirokors.<0> ¤<3><4>Heretical Bedlam <2>(passive)<10>Dying hostiles that were struck by the Pariah in the last 2 seconds have their corpses ascended after 1 second.<0> @@ -1136,7 +1136,7 @@ t<1><4>Build Magnetar <1>(<3>T<1>)<10>Undeniable cruiser.<0> ¤<3><4>Mitosis <2>(passive)<10>Upon taking damage, this strain incubates, spawning one Rilirokor after a two-second delay.<10>This status cannot be applied if the strain is already incubating.<0> w<1><4>Build Cuirass <1>(<3>W<1>)<10>Durable frontline walker.<0> ¤<3><4>Stonewall Protocol <2>(passive)<10>Upon taking fatal damage, the Cuirass deactivates, regains 50 HP, and begins self-repairing for 15 HP per second until fully-healed. If the Cuirass is dealt fatal damage again before it can fully repair, it is destroyed.<0> -<0> +g<1><4>Warp in Gladius <1>(<3>G<1>)<10>Sustaining corvette.<0> r<5><4>Morph into Iroleth <1>(<3>R<1>)<10>Transport strain. Provides detection.<0> <0> t<1><4>Build Lodestone <1>(<3>T<1>)<10>Defensive emplacement. Detects hidden enemies.<0> @@ -2301,7 +2301,7 @@ Goremasts<0> Eyelets<0> Alko Ashgun<0> Phase Rifle<0> -<0> +Plasma Flurry<0> <0> <0> <0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 76454280..b7abef5a 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 3a3fecea..a4f3cd08 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -439,7 +439,7 @@ Burrow [NONE] RadixInit: playfram 0x00 - imgul 2076 0 0 # Radix Shadow (cm\a\radix-shadow.grp) + imgulnextid 2 -2 # Radix Shadow (cm\a\radix-shadow.grp) goto SkryrokorLocal00 RadixSpecialState1: @@ -447,7 +447,7 @@ RadixSpecialState1: goto SkryrokorLocal00 RadixAlmostBuilt: - playfram 2 + playfram 7 goto SkryrokorLocal00 RadixBuilt: @@ -457,8 +457,18 @@ RadixBuilt: RadixIsWorking: playfram 1 wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 playfram 0 - waitrand 1 2 + wait 5 goto RadixIsWorking RadixDisable: diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 57ea2d6e..7cefb44a 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 88c05139..b45af76c 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -15973,4 +15973,81 @@ CabalistStarboundWalkingToIdle: CabalistStarboundWarpIn: imgol 2123 0 0 # CabalistStarbound Warp Flash (cm\protoss\cabalist-starbound.grp) - goto CabalistStarboundWalkingToIdle \ No newline at end of file + goto CabalistStarboundWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2470 Gladius (Order) (cm\f-p\gladius-order.grp) +.headerstart +IsId 737 +Type 21 +Init GladiusOrderInit +Death GladiusOrderDeath +GndAttkInit GladiusOrderGndAttkInit +AirAttkInit GladiusOrderGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt GladiusOrderGndAttkInit +AirAttkRpt GladiusOrderGndAttkInit +CastSpell [NONE] +GndAttkToIdle GladiusOrderGndAttkToIdle +AirAttkToIdle GladiusOrderGndAttkToIdle +Unused2 [NONE] +Walking GladiusOrderWalking +WalkingToIdle GladiusOrderWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn GladiusOrderWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +GladiusOrderInit: + imgulnextid 0 42 # Gladius (Order) Shadow (cm\f-p\gladius-order.grp) +GladiusOrderGndAttkToIdle: + playfram 0x00 + goto GladiusOrderWalkingToIdle + +GladiusOrderWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto GladiusOrderWalkingToIdle + +GladiusOrderDeath: + playsnd 533 # Protoss\Scout\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium + wait 1 + end + +GladiusOrderGndAttkInit: + nobrkcodestart + playsndbtwn 1926 1928 # GladiusOrder weaponfire 01, 02, 03 + playfram 0x20 + attackwith 1 + wait 2 + playfram 0x00 + nobrkcodeend + gotorepeatattk + goto SkryrokorLocal00 + +GladiusOrderWalking: + setvertpos 0 + imgol 2472 0 0 # Gladius (Order) Engines (cm\f-p\gladius-order-engine.grp) + playfram 0x00 + goto SkryrokorLocal00 + +GladiusOrderWarpIn: + imgol 2473 0 0 # Gladius (Order) Warp Flash (cm\f-p\gladius-order.grp) + goto GladiusOrderWalkingToIdle \ No newline at end of file diff --git a/mpq/sound/cm/t/mine/restock-01.wav b/mpq/sound/cm/t/mine/restock-01.wav new file mode 100644 index 00000000..a4f4b636 Binary files /dev/null and b/mpq/sound/cm/t/mine/restock-01.wav differ diff --git a/mpq/tileset/install.vf4 b/mpq/tileset/install.vf4 index 22656b65..fde90276 100644 Binary files a/mpq/tileset/install.vf4 and b/mpq/tileset/install.vf4 differ diff --git a/mpq/unit/cm/a/landlock.grp b/mpq/unit/cm/a/landlock.grp index f103fe67..414fb821 100644 Binary files a/mpq/unit/cm/a/landlock.grp and b/mpq/unit/cm/a/landlock.grp differ diff --git a/mpq/unit/cm/a/radix-damage.lof b/mpq/unit/cm/a/radix-damage.lof index 67c9ec8f..42aa2201 100644 Binary files a/mpq/unit/cm/a/radix-damage.lof and b/mpq/unit/cm/a/radix-damage.lof differ diff --git a/mpq/unit/cm/a/radix-shadow.grp b/mpq/unit/cm/a/radix-shadow.grp index 24f44b86..c9904101 100644 Binary files a/mpq/unit/cm/a/radix-shadow.grp and b/mpq/unit/cm/a/radix-shadow.grp differ diff --git a/mpq/unit/cm/a/radix.grp b/mpq/unit/cm/a/radix.grp index 1306c301..54c312ac 100644 Binary files a/mpq/unit/cm/a/radix.grp and b/mpq/unit/cm/a/radix.grp differ diff --git a/mpq/unit/cm/f-p/gladius-order-engine.grp b/mpq/unit/cm/f-p/gladius-order-engine.grp new file mode 100644 index 00000000..66ac183c Binary files /dev/null and b/mpq/unit/cm/f-p/gladius-order-engine.grp differ diff --git a/mpq/unit/cm/f-p/gladius-order.grp b/mpq/unit/cm/f-p/gladius-order.grp new file mode 100644 index 00000000..230f90e6 Binary files /dev/null and b/mpq/unit/cm/f-p/gladius-order.grp differ diff --git a/mpq/unit/cm/t/mine-restock-overlay.grp b/mpq/unit/cm/t/mine-restock-overlay.grp new file mode 100644 index 00000000..2a311f86 Binary files /dev/null and b/mpq/unit/cm/t/mine-restock-overlay.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index e3bab041..348f1032 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 1233066e..3eb67e3a 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 226b9805..606f6597 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 00696710..dbcfaaaa 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 49817e45..ab525da2 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -32,7 +32,7 @@ ## Audiovisuals - New models for: - Vorvrokor (c. Baelethal) - - Landlock (c. fasswawds) + - Landlock, Radix (c. fasswawds) - Resized model for Talos - Modified unit responses for Vorvrokor - New weapon SFX for Alzurokor (c. lolrsk8s) @@ -82,6 +82,10 @@ - [Gateway](https://cosmonarchy.com/protoss/gateway): - Resource costs 175/0 » 150/0 +## Protoss factions +- **NEW:** [Gladius (Order)](https://cosmonarchy.com/protoss/gladius-order): + - Order of the Sacred Saber Gladius variant. Has Triumphant Rise (a la Herald / Archon). + ## Zerg - [Zethrokor](https://cosmonarchy.com/zerg/zethrokor): - Resource cost 25/0 » 50/0 diff --git a/plugins/aise.qdp b/plugins/aise.qdp index f462d9f3..9b509bc6 100644 Binary files a/plugins/aise.qdp and b/plugins/aise.qdp differ diff --git a/plugins/aize_debug.qdp b/plugins/aize_debug.qdp index 79824b16..25dbe5fa 100644 Binary files a/plugins/aize_debug.qdp and b/plugins/aize_debug.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 0f0e19ae..56e1a2bf 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ