diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index cebb34ed..383a57d8 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 7efb969e..fb6ac91f 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -715,8 +715,8 @@ Hydrokor (Goszirith) Nihilist Maverick (Golden) Gladius (Order) -Extended Flingy #509 -Extended Flingy #510 +Shaman (Upstart, Support) +Shaman (Upstart, Adrenaline) Extended Flingy #511 Extended Flingy #512 Extended Flingy #513 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 9337460c..09e5c2ce 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 f3d0ab76..931f7ce4 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 2b9fb4a7..e8887086 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2472,10 +2472,10 @@ Gladius (Order) Gladius (Order) Shadow Gladius (Order) Engine Gladius (Order) Warp Flash -Extended Image #1472 -Extended Image #1473 -Extended Image #1474 -Extended Image #1475 +Droleth Mutate +Shaman (Upstart, Support) +Shaman (Upstart) Shadow +Shaman (Upstart, Adrenaline) Extended Image #1476 Extended Image #1477 Extended Image #1478 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 6684e2ca..af8410b2 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 131b454d..28c16f39 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4321,31 +4321,31 @@ Paraclete Weaponfire 02 Paraclete Weaponfire 03 Paraclete Cast 01 Function Ambient 01 -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 +Cosmoscope Ambient 01 +Morrigan Weaponfire 01 +Morrigan Weaponfire 02 +Morrigan Weaponfire 03 +Morrigan Weaponfire 04 +Morrigan Weaponfire 05 +Morrigan Weaponfire 06 +Error Askosi +Maverick (Golden) Weaponfire 01 +Maverick (Golden) Weaponfire 02 +Maverick (Golden) Weaponfire 03 +Maverick (Golden) Weaponfire 04 +Maverick (Golden) Weaponfire 05 +Maverick (Golden) Weaponfire 06 +Cloak Attack On +Cloak Attack Off +Cloak Damage On 01 +Cloak Damage On 02 +Cloak Damage On 03 +Cloak Damage Off 01 +Cloak Damage Off 02 +Askosi Structure Placement 01 +Iconoclast Weaponfire 01 +Iconoclast Weaponfire 02 +Iconoclast Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a3402c51..8838f486 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4142,7 +4142,7 @@ cm\a\a-construction-end-01.wav cm\a\a-rescue-01.wav cm\a\_building\landlock\wht-01.wav cm\a\_building\function\wht-01.wav -cm\a\_building\cosmoscope-wht-01.wav +cm\a\_building\cosmoscope\wht-01.wav cm\a\a-explosion-medium-01.wav cm\a\a-explosion-medium-02.wav cm\a\a-explosion-medium-03.wav @@ -4320,4 +4320,29 @@ cm\a\paraclete\wf-01.wav cm\a\paraclete\wf-02.wav cm\a\paraclete\wf-03.wav cm\a\paraclete\cast-01.wav -cm\a\_building\function\amb-01.wav \ No newline at end of file +cm\a\_building\function\amb-01.wav +cm\a\_building\cosmoscope\amb-01.wav +cm\f-t\morrigan\wf-01.wav +cm\f-t\morrigan\wf-02.wav +cm\f-t\morrigan\wf-03.wav +cm\f-t\morrigan\wf-04.wav +cm\f-t\morrigan\wf-05.wav +cm\f-t\morrigan\wf-06.wav +cm\advisors\error-askosi.wav +cm\f-t\maverick-golden\wf-01.wav +cm\f-t\maverick-golden\wf-02.wav +cm\f-t\maverick-golden\wf-03.wav +cm\f-t\maverick-golden\wf-04.wav +cm\f-t\maverick-golden\wf-05.wav +cm\f-t\maverick-golden\wf-06.wav +cm\t\cloak-attack-on.wav +cm\t\cloak-attack-off.wav +cm\b\cloak-damage-on-01.wav +cm\b\cloak-damage-on-02.wav +cm\b\cloak-damage-on-03.wav +cm\b\cloak-damage-off-01.wav +cm\b\cloak-damage-off-02.wav +cm\a\a-placement-01.wav +cm\a\iconoclast\wf-01.wav +cm\a\iconoclast\wf-02.wav +cm\a\iconoclast\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 77339da0..58fa9521 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 868bdbbd..4f4e493b 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1187,8 +1187,8 @@ Morrigan Remains Maverick (Golden) Maverick (Golden) Remains Gladius (Order) -Extended Sprite #673 -Extended Sprite #674 +Shaman (Upstart, Support) +Shaman (Upstart, Adrenaline) Extended Sprite #675 Extended Sprite #676 Extended Sprite #677 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 0cff9efb..bb547fc7 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 e6ba362a..deced9d3 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 e628bcb9..fd7e6d85 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -303,9 +303,9 @@ Eyelets (Proselyte) Alko Ashgun (Scralia) Phase Rifle (Maverick Golden) Plasma Flurry (Gladius Order) -Extended Weapon #176 -Extended Weapon #177 -Extended Weapon #178 +Epitaph Grenade Launcher (Morrigan) +Scalpel Cannon (Shaman Upstart) +Reactive Blaster (Manifold Starbound) Extended Weapon #179 Extended Weapon #180 Extended Weapon #181 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index c9832cd9..89a5db5d 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 45cb4fab..18f5837a 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 4403e013..43c09694 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 ef0f8b35..bd727fbf 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/glue/dynamic/pokpopup.pcx b/mpq/glue/dynamic/pokpopup.pcx new file mode 100644 index 00000000..68ca0540 Binary files /dev/null and b/mpq/glue/dynamic/pokpopup.pcx differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 3793a5a4..a02983e0 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -316,9 +316,9 @@ Spider Mines<0> Goremasts<0> Piety Wards<0> -<0> -<0> -<0> +Morrigan Requires:<10> Covenant<0> +f<1><4>Train Morrigan <1>(<3>G<1>)<10>Crowd-control infantry.<0> +¤<3><4>Dampening Field <2>(passive)<10>This combatant becomes cloaked for 2 seconds after attacking.<0> 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> @@ -1752,7 +1752,7 @@ t<1><4>Train Apostle <1>(<3>T<1>)<10>Reanimation specialist.<0> <0> <0> <0> -<0> +s<1><4>Build Shaman <1>(<3>S<1>)<10>Augmenting support vehicle.<0> ¤<3><4>Martyrous Tempest <2>(passive)<10>On death, Archons release a Psionic Storm that lasts for 10 seconds.<0> x<3><4>Skryspawn <1>(<3>X<1>)<10>Channels to spawn 6 Skryrokors over 3 seconds.<0> Gestating...<0> @@ -2302,8 +2302,8 @@ Eyelets<0> Alko Ashgun<0> Phase Rifle<0> Plasma Flurry<0> -<0> -<0> +Epitaph Grenade Launcher<0> +Scalpel Cannon<0> <0> <0> <0> diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index ea8e49d8..538a6385 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -141,7 +141,7 @@ military goremast = 567 military broadside = 568 military vulture_upstart = 570 military maverick_upstart = 573 -military eidolon_upstart = 575 +military morrigan = 575 military ajax = 576 military maverick_golden = 580 military shaman_upstart = 581 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 37f1dbda..7f27fe88 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 580c26d6..9e198a53 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 68027181..fe8a6d80 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1504,7 +1504,7 @@ CosmoscopeSpecialState1: goto SkryrokorLocal00 CosmoscopeAlmostBuilt: - playfram 6 + playfram 9 goto SkryrokorLocal00 CosmoscopeBuilt: @@ -1522,8 +1522,12 @@ CosmoscopeIsWorking: wait 2 playfram 5 wait 2 - playfram 0x00 - wait 6 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 goto CosmoscopeIsWorking CosmoscopeDisable: @@ -4220,8 +4224,10 @@ IconoclastGndAttkInit: wait 1 nobrkcodestart playfram 0x00 + playsndbtwn 4345 4347 # Iconoclast weaponfire 01, 02, 03 attackwith 1 wait 2 + playsndbtwn 4345 4347 # Iconoclast weaponfire 01, 02, 03 attackwith 1 wait 1 nobrkcodeend diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 17aad709..68b39a23 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 4fe033dd..d3969f81 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -15461,7 +15461,7 @@ SpecialState1 ShamanSupportModeSpecialState1 # ----------------------------------------------------------------------------- # ShamanSupportModeInit: - imgul 1227 0 4 # Shaman Shadow (cm\terran\shaman-shadow.grp) + imgulnextid 0 0 # Shaman Shadow (cm\terran\shaman-shadow.grp) playfram 0x00 goto ShamanSupportModeGndAttkToIdle @@ -21583,4 +21583,395 @@ MaverickGoldenWalking: move 4 wait 1 playfram 0x80 - goto MaverickGoldenWalking \ No newline at end of file + goto MaverickGoldenWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2475 Shaman (Upstart) Support Mode (cm\f-t\shaman-upstart.grp) +.headerstart +IsId 854 +Type 13 +Init ShamanUpstartSupportModeInit +Death ShamanUpstartSupportModeDeath +GndAttkInit ShamanUpstartSupportGndAttkInit +AirAttkInit ShamanUpstartSupportGndAttkInit +Unused1 ShamanUpstartSupportModeUnused1 +GndAttkRpt ShamanUpstartSupportGndAttkInit +AirAttkRpt ShamanUpstartSupportGndAttkInit +CastSpell ShamanUpstartSupportModeCastSpell +GndAttkToIdle ShamanUpstartSupportModeGndAttkToIdle +AirAttkToIdle ShamanUpstartSupportModeGndAttkToIdle +Unused2 [NONE] +Walking ShamanUpstartSupportModeWalking +WalkingToIdle ShamanUpstartSupportModeGndAttkToIdle +SpecialState1 ShamanUpstartSupportModeSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +ShamanUpstartSupportModeInit: + imgulnextid 0 0 # Shaman (Upstart) Shadow (cm\f-t\shaman-upstart-shadow.grp) + playfram 0x00 + goto ShamanUpstartSupportModeGndAttkToIdle + +ShamanUpstartSupportModeGndAttkToIdle: + playfram 0x00 + setvertpos 1 + wait 8 + setvertpos 2 + wait 8 + setvertpos 1 + wait 8 + setvertpos 0 + wait 8 + goto ShamanUpstartSupportModeGndAttkToIdle + +ShamanUpstartSupportModeDeath: + playsndbtwn 2834 2835 # Shaman Death 01, 02 + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 821 0 0 # Shaman Remains + wait 1 + end + +ShamanUpstartSupportModeUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 # Shaman Death Reversed 01, 02 + sprol 742 0 0 # Orange Explosion Medium Reversed + setfldirect 12 + wait 12 + nobrkcodeend + goto ShamanUpstartSupportModeGndAttkToIdle + +ShamanUpstartSupportGndAttkInit: + wait 1 + playfram 0x20 + playsndbtwn 2775 2776 # Cuirass weapon fire 01, 02 + attack + wait 1 + playfram 0x00 + gotorepeatattk + goto ShamanUpstartSupportModeGndAttkToIdle + +ShamanUpstartSupportModeCastSpell: + playfram 0x00 + wait 6 + goto ShamanUpstartSupportModeGndAttkToIdle + +ShamanUpstartSupportModeWalking: + setvertpos 0 + goto SkryrokorLocal00 + +ShamanUpstartSupportModeSpecialState1: + attackwith 1 + sigorder 1 + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2477 Shaman Adrenaline Mode (cm\f-t\shaman-upstart.grp) +.headerstart +IsId 855 +Type 14 +Init ShamanAdrenalineModeInit +Death ShamanAdrenalineModeDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 ShamanAdrenalineModeUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell ShamanAdrenalineModeGndAttkToIdle +GndAttkToIdle ShamanAdrenalineModeGndAttkToIdle +AirAttkToIdle ShamanAdrenalineModeGndAttkToIdle +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 ShamanAdrenalineModeSpecialState2 +SpecialState2 ShamanAdrenalineModeSpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ShamanAdrenalineModeInit: + imgul 2476 0 0 # Shaman Shadow (cm\f-t\shaman-upstart-shadow.grp) + wait 1 + playsnd 2429 # Shaman Adrenaline Transform + setflspeed 0 + playfram 0x00 + wait 2 + playfram 0x40 + wait 3 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 6 + sigorder 1 + goto ShamanAdrenalineModeGndAttkToIdle + +ShamanAdrenalineModeGndAttkToIdle: + playfram 0x100 + wait 2 + playfram 0x120 + wait 2 + playfram 0x140 + wait 2 + playfram 0x160 + wait 2 + playfram 0x180 + wait 2 + playfram 0x1A0 + wait 2 + playfram 0x1C0 + wait 2 + playfram 0x1E0 + wait 2 + playfram 0x200 + wait 2 + goto ShamanAdrenalineModeGndAttkToIdle + +ShamanAdrenalineModeDeath: + playsndbtwn 2834 2835 # Shaman Death 01, 02 + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +ShamanAdrenalineModeUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 # Shaman Death Reversed 01, 02 + sprol 742 0 0 # Orange Explosion Medium Reversed + setfldirect 12 + wait 12 + nobrkcodeend + goto ShamanAdrenalineModeGndAttkToIdle + +ShamanAdrenalineModeSpecialState2: + playsnd 2430 # Matador Tank Transform + playfram 0xE0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xA0 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + wait 3 + playfram 0x40 + wait 1 + playfram 0x00 + wait 6 + sigorder 1 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2313 Morrigan (cm\f-t\morrigan.grp) +.headerstart +IsId 856 +Type 13 +Init MorriganInit +Death MorriganDeath +GndAttkInit MorriganGndAttkInit +AirAttkInit MorriganGndAttkInit +Unused1 MorriganUnused1 +GndAttkRpt MorriganGndAttkRpt +AirAttkRpt MorriganGndAttkRpt +CastSpell MorriganCastSpell +GndAttkToIdle MorriganGndAttkToIdle +AirAttkToIdle MorriganGndAttkToIdle +Unused2 [NONE] +Walking MorriganWalking +WalkingToIdle MorriganWalkingToIdle +SpecialState1 MorriganSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +MorriganInit: + imgulnextid 0 0 # Morrigan Shadow (cm\f-t\morrigan-shadow.grp) +MorriganWalkingToIdle: + playfram 0x60 +MorriganLocal00: + wait 63 + randcondjmp 25 MorriganLocal01 + randcondjmp 128 MorriganLocal02 + goto MorriganLocal00 + +MorriganLocal01: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + randcondjmp 192 MorriganLocal03 + 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 MorriganLocal04 + +MorriganLocal04: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto MorriganWalkingToIdle + +MorriganLocal03: + wait 13 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto MorriganWalkingToIdle + +MorriganLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto MorriganWalkingToIdle + +MorriganDeath: + playsnd 238 # Terran\GHOST\TGhDth00.wav + goto EidolonDeathInit + +MorriganUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1166 # Morrigan revive 01 + playfram 423 + wait 2 + playfram 422 + wait 2 + playfram 421 + wait 2 + playfram 420 + wait 2 + playfram 419 + wait 2 + playfram 418 + wait 2 + playfram 417 + wait 2 + playfram 416 + wait 2 + setfldirect 12 + nobrkcodeend + goto MorriganWalkingToIdle + +MorriganGndAttkInit: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + sigorder 32 + playfram 0x40 + wait 1 +MorriganGndAttkRpt: + wait 1 + nobrkcodestart + attack + playsndbtwn 4324 4329 # Morrigan weaponfire 01, 02, 03, 04, 05, 06 + playfram 0x180 + wait 1 + playfram 0x40 + nobrkcodeend + gotorepeatattk + ignorerest +MorriganGndAttkToIdle: + playfram 0x11 + wait 1 + playfram 0x00 + wait 1 + goto MorriganWalkingToIdle + +MorriganCastSpell: + nobrkcodestart + wait 1 + playsnd 240 # Terran\GHOST\TGhLkd00.wav + castspell + playfram 0x180 + wait 2 + playfram 0x40 + nobrkcodeend + gotorepeatattk + sigorder 2 + goto MorriganGndAttkToIdle + +MorriganWalking: + 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 0x160 + move 4 + wait 1 + playfram 0x60 + goto MorriganWalking + +MorriganSpecialState1: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/sound/cm/a/_building/cosmoscope/amb-01.wav b/mpq/sound/cm/a/_building/cosmoscope/amb-01.wav new file mode 100644 index 00000000..8d453884 Binary files /dev/null and b/mpq/sound/cm/a/_building/cosmoscope/amb-01.wav differ diff --git a/mpq/sound/cm/a/_building/cosmoscope-wht-01.wav b/mpq/sound/cm/a/_building/cosmoscope/wht-01.wav similarity index 100% rename from mpq/sound/cm/a/_building/cosmoscope-wht-01.wav rename to mpq/sound/cm/a/_building/cosmoscope/wht-01.wav diff --git a/mpq/sound/cm/a/a-placement-01.wav b/mpq/sound/cm/a/a-placement-01.wav new file mode 100644 index 00000000..2fc89254 Binary files /dev/null and b/mpq/sound/cm/a/a-placement-01.wav differ diff --git a/mpq/sound/cm/a/iconoclast/wf-01.wav b/mpq/sound/cm/a/iconoclast/wf-01.wav new file mode 100644 index 00000000..93fcb7f2 Binary files /dev/null and b/mpq/sound/cm/a/iconoclast/wf-01.wav differ diff --git a/mpq/sound/cm/a/iconoclast/wf-02.wav b/mpq/sound/cm/a/iconoclast/wf-02.wav new file mode 100644 index 00000000..a801ecc4 Binary files /dev/null and b/mpq/sound/cm/a/iconoclast/wf-02.wav differ diff --git a/mpq/sound/cm/a/iconoclast/wf-03.wav b/mpq/sound/cm/a/iconoclast/wf-03.wav new file mode 100644 index 00000000..8f193328 Binary files /dev/null and b/mpq/sound/cm/a/iconoclast/wf-03.wav differ diff --git a/mpq/sound/cm/advisors/error-askosi.wav b/mpq/sound/cm/advisors/error-askosi.wav new file mode 100644 index 00000000..87a2f109 Binary files /dev/null and b/mpq/sound/cm/advisors/error-askosi.wav differ diff --git a/mpq/sound/cm/b/cloak-damage-off-01.wav b/mpq/sound/cm/b/cloak-damage-off-01.wav new file mode 100644 index 00000000..c76eea84 Binary files /dev/null and b/mpq/sound/cm/b/cloak-damage-off-01.wav differ diff --git a/mpq/sound/cm/b/cloak-damage-off-02.wav b/mpq/sound/cm/b/cloak-damage-off-02.wav new file mode 100644 index 00000000..77b7f9fe Binary files /dev/null and b/mpq/sound/cm/b/cloak-damage-off-02.wav differ diff --git a/mpq/sound/cm/b/cloak-damage-on-01.wav b/mpq/sound/cm/b/cloak-damage-on-01.wav new file mode 100644 index 00000000..89425b9d Binary files /dev/null and b/mpq/sound/cm/b/cloak-damage-on-01.wav differ diff --git a/mpq/sound/cm/b/cloak-damage-on-02.wav b/mpq/sound/cm/b/cloak-damage-on-02.wav new file mode 100644 index 00000000..517c81f2 Binary files /dev/null and b/mpq/sound/cm/b/cloak-damage-on-02.wav differ diff --git a/mpq/sound/cm/b/cloak-damage-on-03.wav b/mpq/sound/cm/b/cloak-damage-on-03.wav new file mode 100644 index 00000000..e909e1bf Binary files /dev/null and b/mpq/sound/cm/b/cloak-damage-on-03.wav differ diff --git a/mpq/sound/cm/f-t/maverick-golden/wf-01.wav b/mpq/sound/cm/f-t/maverick-golden/wf-01.wav new file mode 100644 index 00000000..387bcce0 Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-golden/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/maverick-golden/wf-02.wav b/mpq/sound/cm/f-t/maverick-golden/wf-02.wav new file mode 100644 index 00000000..48091448 Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-golden/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/maverick-golden/wf-03.wav b/mpq/sound/cm/f-t/maverick-golden/wf-03.wav new file mode 100644 index 00000000..7eb0b6c0 Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-golden/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/maverick-golden/wf-04.wav b/mpq/sound/cm/f-t/maverick-golden/wf-04.wav new file mode 100644 index 00000000..b8e6473e Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-golden/wf-04.wav differ diff --git a/mpq/sound/cm/f-t/maverick-golden/wf-05.wav b/mpq/sound/cm/f-t/maverick-golden/wf-05.wav new file mode 100644 index 00000000..bfdbb857 Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-golden/wf-05.wav differ diff --git a/mpq/sound/cm/f-t/maverick-golden/wf-06.wav b/mpq/sound/cm/f-t/maverick-golden/wf-06.wav new file mode 100644 index 00000000..641a63b0 Binary files /dev/null and b/mpq/sound/cm/f-t/maverick-golden/wf-06.wav differ diff --git a/mpq/sound/cm/f-t/morrigan/wf-01.wav b/mpq/sound/cm/f-t/morrigan/wf-01.wav new file mode 100644 index 00000000..9f0e1a24 Binary files /dev/null and b/mpq/sound/cm/f-t/morrigan/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/morrigan/wf-02.wav b/mpq/sound/cm/f-t/morrigan/wf-02.wav new file mode 100644 index 00000000..963036c5 Binary files /dev/null and b/mpq/sound/cm/f-t/morrigan/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/morrigan/wf-03.wav b/mpq/sound/cm/f-t/morrigan/wf-03.wav new file mode 100644 index 00000000..4e2dd6cc Binary files /dev/null and b/mpq/sound/cm/f-t/morrigan/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/morrigan/wf-04.wav b/mpq/sound/cm/f-t/morrigan/wf-04.wav new file mode 100644 index 00000000..47d4244e Binary files /dev/null and b/mpq/sound/cm/f-t/morrigan/wf-04.wav differ diff --git a/mpq/sound/cm/f-t/morrigan/wf-05.wav b/mpq/sound/cm/f-t/morrigan/wf-05.wav new file mode 100644 index 00000000..d81d4a6c Binary files /dev/null and b/mpq/sound/cm/f-t/morrigan/wf-05.wav differ diff --git a/mpq/sound/cm/f-t/morrigan/wf-06.wav b/mpq/sound/cm/f-t/morrigan/wf-06.wav new file mode 100644 index 00000000..73879bc6 Binary files /dev/null and b/mpq/sound/cm/f-t/morrigan/wf-06.wav differ diff --git a/mpq/sound/cm/t/cloak-attack-off.wav b/mpq/sound/cm/t/cloak-attack-off.wav new file mode 100644 index 00000000..1a67e6d4 Binary files /dev/null and b/mpq/sound/cm/t/cloak-attack-off.wav differ diff --git a/mpq/sound/cm/t/cloak-attack-on.wav b/mpq/sound/cm/t/cloak-attack-on.wav new file mode 100644 index 00000000..779ac392 Binary files /dev/null and b/mpq/sound/cm/t/cloak-attack-on.wav differ diff --git a/mpq/unit/cm/a/cosmoscope-damage.lof b/mpq/unit/cm/a/cosmoscope-damage.lof index a0f64a12..c47590bd 100644 Binary files a/mpq/unit/cm/a/cosmoscope-damage.lof and b/mpq/unit/cm/a/cosmoscope-damage.lof differ diff --git a/mpq/unit/cm/a/cosmoscope-shadow.grp b/mpq/unit/cm/a/cosmoscope-shadow.grp index c5263595..97d5207b 100644 Binary files a/mpq/unit/cm/a/cosmoscope-shadow.grp and b/mpq/unit/cm/a/cosmoscope-shadow.grp differ diff --git a/mpq/unit/cm/a/cosmoscope.grp b/mpq/unit/cm/a/cosmoscope.grp index d2d835e2..aa8bf7ba 100644 Binary files a/mpq/unit/cm/a/cosmoscope.grp and b/mpq/unit/cm/a/cosmoscope.grp differ diff --git a/mpq/unit/cm/f-t/shaman-upstart-shadow.grp b/mpq/unit/cm/f-t/shaman-upstart-shadow.grp new file mode 100644 index 00000000..a0b0e283 Binary files /dev/null and b/mpq/unit/cm/f-t/shaman-upstart-shadow.grp differ diff --git a/mpq/unit/cm/f-t/shaman-upstart.grp b/mpq/unit/cm/f-t/shaman-upstart.grp new file mode 100644 index 00000000..55d202cc Binary files /dev/null and b/mpq/unit/cm/f-t/shaman-upstart.grp differ diff --git a/mpq/unit/cm/t/shaman-shadow.grp b/mpq/unit/cm/t/shaman-shadow.grp index 4b3bc94b..a2c82e22 100644 Binary files a/mpq/unit/cm/t/shaman-shadow.grp and b/mpq/unit/cm/t/shaman-shadow.grp differ diff --git a/mpq/unit/cm/t/shaman.grp b/mpq/unit/cm/t/shaman.grp index 53b00610..b1ebbd94 100644 Binary files a/mpq/unit/cm/t/shaman.grp and b/mpq/unit/cm/t/shaman.grp differ diff --git a/mpq/unit/cm/z/agrileth-birth.grp b/mpq/unit/cm/z/agrileth-birth.grp index e618ce40..12401114 100644 Binary files a/mpq/unit/cm/z/agrileth-birth.grp and b/mpq/unit/cm/z/agrileth-birth.grp differ diff --git a/mpq/unit/cm/z/agrileth-remains.grp b/mpq/unit/cm/z/agrileth-remains.grp index 061a82e0..673d123a 100644 Binary files a/mpq/unit/cm/z/agrileth-remains.grp and b/mpq/unit/cm/z/agrileth-remains.grp differ diff --git a/mpq/unit/cm/z/agrileth.grp b/mpq/unit/cm/z/agrileth.grp index a6f4bd45..157e6783 100644 Binary files a/mpq/unit/cm/z/agrileth.grp and b/mpq/unit/cm/z/agrileth.grp differ diff --git a/mpq/unit/cm/z/izirokor-birth.grp b/mpq/unit/cm/z/izirokor-birth.grp index 9cb7edaf..37e21930 100644 Binary files a/mpq/unit/cm/z/izirokor-birth.grp and b/mpq/unit/cm/z/izirokor-birth.grp differ diff --git a/mpq/unit/cm/z/izirokor-mutate.grp b/mpq/unit/cm/z/izirokor-mutate.grp index 8361d031..70b04775 100644 Binary files a/mpq/unit/cm/z/izirokor-mutate.grp and b/mpq/unit/cm/z/izirokor-mutate.grp differ diff --git a/mpq/unit/cm/z/izirokor-remains.grp b/mpq/unit/cm/z/izirokor-remains.grp index c507cca6..90bba596 100644 Binary files a/mpq/unit/cm/z/izirokor-remains.grp and b/mpq/unit/cm/z/izirokor-remains.grp differ diff --git a/mpq/unit/cm/z/izirokor-shadow.grp b/mpq/unit/cm/z/izirokor-shadow.grp index 7ada3625..2b6b3d39 100644 Binary files a/mpq/unit/cm/z/izirokor-shadow.grp and b/mpq/unit/cm/z/izirokor-shadow.grp differ diff --git a/mpq/unit/cm/z/izirokor.grp b/mpq/unit/cm/z/izirokor.grp index c4aa2031..33a00f50 100644 Binary files a/mpq/unit/cm/z/izirokor.grp and b/mpq/unit/cm/z/izirokor.grp differ diff --git a/mpq/unit/cm/z/mortothrokor-birth.grp b/mpq/unit/cm/z/mortothrokor-birth.grp index 69358db5..ca553d22 100644 Binary files a/mpq/unit/cm/z/mortothrokor-birth.grp and b/mpq/unit/cm/z/mortothrokor-birth.grp differ diff --git a/mpq/unit/cm/z/mortothrokor-remnants.grp b/mpq/unit/cm/z/mortothrokor-remnants.grp index 835a9791..8c6d66a8 100644 Binary files a/mpq/unit/cm/z/mortothrokor-remnants.grp and b/mpq/unit/cm/z/mortothrokor-remnants.grp differ diff --git a/mpq/unit/cm/z/mortothrokor.grp b/mpq/unit/cm/z/mortothrokor.grp index 2a3ba409..2b779b79 100644 Binary files a/mpq/unit/cm/z/mortothrokor.grp and b/mpq/unit/cm/z/mortothrokor.grp differ diff --git a/mpq/unit/cm/z/nathrokor-birth.grp b/mpq/unit/cm/z/nathrokor-birth.grp index ac289d51..0ef29a29 100644 Binary files a/mpq/unit/cm/z/nathrokor-birth.grp and b/mpq/unit/cm/z/nathrokor-birth.grp differ diff --git a/mpq/unit/cm/z/nathrokor-mutate.grp b/mpq/unit/cm/z/nathrokor-mutate.grp index f9c4a626..26ddbf71 100644 Binary files a/mpq/unit/cm/z/nathrokor-mutate.grp and b/mpq/unit/cm/z/nathrokor-mutate.grp differ diff --git a/mpq/unit/cm/z/nathrokor.grp b/mpq/unit/cm/z/nathrokor.grp index dca47dc0..80c11d2e 100644 Binary files a/mpq/unit/cm/z/nathrokor.grp and b/mpq/unit/cm/z/nathrokor.grp differ diff --git a/mpq/unit/cm/z/vorvrokor-birth.grp b/mpq/unit/cm/z/vorvrokor-birth.grp index 473412f4..6dfc4424 100644 Binary files a/mpq/unit/cm/z/vorvrokor-birth.grp and b/mpq/unit/cm/z/vorvrokor-birth.grp differ diff --git a/mpq/unit/cm/z/vorvrokor-death.grp b/mpq/unit/cm/z/vorvrokor-death.grp deleted file mode 100644 index b15b36fc..00000000 Binary files a/mpq/unit/cm/z/vorvrokor-death.grp and /dev/null differ diff --git a/mpq/unit/cm/z/vorvrokor-remains.grp b/mpq/unit/cm/z/vorvrokor-remains.grp index 5a4a444f..b610c24a 100644 Binary files a/mpq/unit/cm/z/vorvrokor-remains.grp and b/mpq/unit/cm/z/vorvrokor-remains.grp differ diff --git a/mpq/unit/cm/z/vorvrokor-shadow.grp b/mpq/unit/cm/z/vorvrokor-shadow.grp index 81914eaa..ae0d0e18 100644 Binary files a/mpq/unit/cm/z/vorvrokor-shadow.grp and b/mpq/unit/cm/z/vorvrokor-shadow.grp differ diff --git a/mpq/unit/cm/z/vorvrokor.grp b/mpq/unit/cm/z/vorvrokor.grp index 3eeb4bda..f2d31965 100644 Binary files a/mpq/unit/cm/z/vorvrokor.grp and b/mpq/unit/cm/z/vorvrokor.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 79ac04ec..f3348967 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 0bd1db49..6370a90d 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/maverick-death.grp b/mpq/unit/terran/maverick-death.grp deleted file mode 100644 index c822127f..00000000 Binary files a/mpq/unit/terran/maverick-death.grp and /dev/null differ diff --git a/mpq/unit/terran/maverick-remains.grp b/mpq/unit/terran/maverick-remains.grp new file mode 100644 index 00000000..277bfb1a Binary files /dev/null and b/mpq/unit/terran/maverick-remains.grp differ diff --git a/mpq/unit/terran/maverick.grp b/mpq/unit/terran/maverick.grp index 54247743..faf4bf88 100644 Binary files a/mpq/unit/terran/maverick.grp and b/mpq/unit/terran/maverick.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 606f6597..09bca0ad 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 dbcfaaaa..9540a971 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/mpq/unit/zerg/droleth-birth.grp b/mpq/unit/zerg/droleth-birth.grp new file mode 100644 index 00000000..4d663b7d Binary files /dev/null and b/mpq/unit/zerg/droleth-birth.grp differ diff --git a/mpq/unit/zerg/droleth-mutate.grp b/mpq/unit/zerg/droleth-mutate.grp new file mode 100644 index 00000000..c8b4b12e Binary files /dev/null and b/mpq/unit/zerg/droleth-mutate.grp differ diff --git a/mpq/unit/zerg/droleth-death.grp b/mpq/unit/zerg/droleth-remains.grp similarity index 100% rename from mpq/unit/zerg/droleth-death.grp rename to mpq/unit/zerg/droleth-remains.grp diff --git a/mpq/unit/zerg/zethrokor-birth.grp b/mpq/unit/zerg/zethrokor-birth.grp index 2de70a7d..3b5cec62 100644 Binary files a/mpq/unit/zerg/zethrokor-birth.grp and b/mpq/unit/zerg/zethrokor-birth.grp differ diff --git a/mpq/unit/zerg/zethrokor-mutate.grp b/mpq/unit/zerg/zethrokor-mutate.grp index 76450811..082a443f 100644 Binary files a/mpq/unit/zerg/zethrokor-mutate.grp and b/mpq/unit/zerg/zethrokor-mutate.grp differ diff --git a/mpq/unit/zerg/zethrokor-remains.grp b/mpq/unit/zerg/zethrokor-remains.grp index b60f4e99..2d068f8f 100644 Binary files a/mpq/unit/zerg/zethrokor-remains.grp and b/mpq/unit/zerg/zethrokor-remains.grp differ diff --git a/mpq/unit/zerg/zethrokor.grp b/mpq/unit/zerg/zethrokor.grp index 4746ee3e..5b753198 100644 Binary files a/mpq/unit/zerg/zethrokor.grp and b/mpq/unit/zerg/zethrokor.grp differ diff --git a/patchnotes.md b/patchnotes.md index 904d246c..15c9134e 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -28,6 +28,7 @@ - Mimicry no longer fails to account for weapon factor in many cases (r. shopkeeper dog) - **Egocent**s no longer fail to mimic barrage attacks properly (r. Londier) - Mimicry no longer procs on ability weapons (r. Londier) + - - **Audiovisual:** - Corrected strings for **Izirokor** tech-enable on **Skibact Scab** and **Tethvith Swamp** (r. Mimika) - Fixed bad shield overlay for **Vulture (Hecaton)** (r. Londier) @@ -40,12 +41,16 @@ - Landlock, Radix, Function (c. fasswawds) - Resized model for: - Talos, Cyprian +- Modified model for Maverick - Modified unit responses for Vorvrokor +- New error and structure placement SFX for Askosi (c. lolrsk8s) - New weapon SFX for: - Alzurokor (c. lolrsk8s) - - Paraclete + - Iconoclast, Paraclete - New cast SFX for Paraclete -- New training SFX for Function +- New training SFX for: + - Function, Cosmoscope +- New cloaking SFX for damage cloak (e.g. Vestige; c. lolrsk8s) ## Terran - [Maverick](https://cosmonarchy.com/terran/maverick): @@ -96,6 +101,10 @@ ## Protoss - [Gateway](https://cosmonarchy.com/protoss/gateway): - Resource costs 175/0 » 150/0 +- [Atreus](https://cosmonarchy.com/protoss/atreus): + - **Dauntlet Disruption Cannon:** + - Weapon damage 12 » 10 + - Weapon range 5 » 4 ## Protoss factions - **NEW:** [Gladius (Order)](https://cosmonarchy.com/protoss/gladius-order): @@ -110,12 +119,13 @@ - Weapon damage 4 » 5 - [Vorvrokor](https://cosmonarchy.com/zerg/vorvrokor): - Resource cost 50/0 » 75/0 + - HP 80 » 90 - Armor 1 » 2 - Movement speed 9.1 » 9.8 - Collision size increased by ~23% - [Zoryusthaleth](https://cosmonarchy.com/zerg/zoryusthaleth): - Resource cost 175/0 » 200/0 -- [Lakizilisk](): +- [Lakizilisk](https://cosmonarchy.com/zerg/lakizilisk): - **Subterranean Spines:** - Weapon damage 12 » 15 - Weapon cooldown 1.63 » 1.75 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 6b4f0881..aed6d860 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ