diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 6fa2ffbe..f0b15793 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 c58ae9b2..35334103 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -281,7 +281,7 @@ Phobos Laser Salamander Torpedo copy Sanctum of Sorrow Geszkath Grotto -Shaman +Shaman (Support Mode) Alkaj Chasm Idol Golem @@ -483,11 +483,11 @@ Matador Turret (Cinder Mode) Wyvern Turret Analogue Mortothrokor -Extended Flingy #277 -Extended Flingy #278 -Extended Flingy #279 -Extended Flingy #280 -Extended Flingy #281 +Shaman (Visionary Mode) +Vilgoleth +Madrigal Turret (Imperioso) +Madrigal (Furia Mode) +Madrigal Turret (Furia) Extended Flingy #282 Extended Flingy #283 Extended Flingy #284 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 2e6ad236..94d58aeb 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 7c1ae07f..d099e3b7 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 2fd28636..9da0f857 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1004,7 +1004,7 @@ Vespene Ridge Iroleth Matrix Paladin -Madrigal +Madrigal Base (Imperioso) Savant Scrapyard Rotary @@ -1224,7 +1224,7 @@ Kalkalisk Birth Iroleth Birth Nathrokor Birth Alkajelisk Birth -Shaman +Shaman (Support Mode) Shaman Shadow Protoss Temple Shadow Burst Lasers Silent @@ -1737,12 +1737,12 @@ Mortothrokor Mortothrokor Shadow Mortothrokor Remnants Phantom Strike Proc -Extended Image #737 -Extended Image #738 -Extended Image #739 -Extended Image #740 -Extended Image #741 -Extended Image #742 +Shaman (Visionary Mode) +Terran Cancel Structure +Vilgoleth +Madrigal Turret (Imperioso) +Madrigal Base (Furia) +Madrigal Turret (Furia) Extended Image #743 Extended Image #744 Extended Image #745 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index eb39cf58..379e1d39 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 e3e81af2..f7338017 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2466,14 +2466,14 @@ Wendigo Order Passive 01 Wendigo Order Passive 02 Wendigo Order Passive 03 Wendigo Order Passive 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Protoss Cancel Structure +Terran Cancel Structure +Apostle Toggle Lazarus 01 +Apostle Toggle Lazarus 02 +Apostle Toggle Lazarus 03 +Shaman Visionary 01 +Shaman Visionary 02 +Shaman Support 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index d86bcdef..c24559ef 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1275,6 +1275,7 @@ cm\p\starsovereign\bl-01.wav cm\t\apostle\ready-01.wav cm\p\mind-tyrant\ch-01.wav cm\z\akistrokor\ch-01.wav +caw.wav cm\t\apostle\what-01.wav cm\t\apostle\what-02.wav cm\t\apostle\what-03.wav @@ -1298,7 +1299,6 @@ cm\z\konvilisk\wf-01.wav cm\z\konvilisk\wf-02.wav cm\z\almaksalisk\wf-01.wav cm\z\almaksalisk\wf-02.wav -caw.wav cm\t\apostle\death-01.wav cm\t\minotaur\wf-01.wav cm\t\minotaur\wf-02.wav @@ -2465,4 +2465,12 @@ cm\f\wendigo\wht-04.wav cm\f\wendigo\yes-01.wav cm\f\wendigo\yes-02.wav cm\f\wendigo\yes-03.wav -cm\f\wendigo\yes-04.wav \ No newline at end of file +cm\f\wendigo\yes-04.wav +cm\p\_building\cancel-protoss-01.wav +cm\t\_building\cancel-terran-01.wav +cm\t\apostle\toggle-01.wav +cm\t\apostle\toggle-02.wav +cm\t\apostle\toggle-03.wav +cm\t\shaman\switch-01.wav +cm\t\shaman\switch-02.wav +cm\t\shaman\switch-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 91f3486e..cb94476e 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 455d173c..46b1beec 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -590,7 +590,7 @@ Ecclesiast Atreus Amaranth Geszkath Grotto -Shaman +Shaman (Support Mode) Alkaj Chasm Idol Golem @@ -867,12 +867,12 @@ Wyvern Turret Analogue Mortothrokor Mortothrokor Remnants -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Shaman (Visionary Mode) +Terran Cancel Structure +Vilgoleth +Madrigal Turret (Imperioso) +Madrigal (Furia Mode) +Madrigal Turret (Furia) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 97619163..60f878fa 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 271fb2ad..9c40d06a 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -13,7 +13,7 @@ Terran Trojan Terran Minotaur Spider Mine Nuclear Missile -Terran Shaman +Terran Shaman (Support Mode) Protoss Manifold Protoss Architect Terran Madcap @@ -25,7 +25,7 @@ Terran Gorgon Terran Phobos Protoss Gladius Protoss Magister -Terran Madrigal +Terran Madrigal (Imperioso Mode) Terran Centaur Zerg Almaksalisk Terran Phalanx (Siege Mode) @@ -376,11 +376,11 @@ Matador Turret (Cinder Mode) Lobotomy Mine Wyvern Turret Zerg Axitrilisk (Weaponless) -Extended Unit #151 -Extended Unit #152 -Extended Unit #153 -Extended Unit #154 -Extended Unit #155 +Zerg Vilgoleth +Terran Shaman (Visionary Mode) +Madrigal Turret (Imperioso) +Terran Madrigal (Furia Mode) +Madrigal Turret (Furia) Extended Unit #156 Extended Unit #157 Extended Unit #158 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 27cbde2d..74df5e27 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 6c575da8..92749fb6 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 9a4a9d8c..72e5ecb9 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 1abbd0f5..1f3acebd 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index c0f95e71..85a783c5 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 55f90d51..e6a4b65e 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index eac7f7d8..7eb5382f 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -984,7 +984,7 @@ SpecialState1 EggSpecialState1 # ----------------------------------------------------------------------------- # EggInit: - imgul 22 0 0 # Egg Shadow (zerg\zegShad.grp) + imgul 22 0 -4 # Egg Shadow (zerg\zegShad.grp) playfram 20 wait 2 playfram 21 @@ -6059,7 +6059,7 @@ Goliath_Turret_GndAttkInit: Goliath_Turret_AirAttkInit: wait 1 attackwith 2 - playsndbtwn 1292 1293 # Goliath air weapon fire 01, 02 + playsndbtwn 1293 1294 # Goliath air weapon fire 01, 02 gotorepeatattk goto Goliath_Turret_Init @@ -6961,12 +6961,14 @@ SpiderMineWalking: SpiderMineSpecialState1: castspell sigorder 1 + playsnd 10 # Misc\Explo1.wav imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) goto SpiderMineLocal00 SpiderMineUnused2: fireweapon 89 sigorder 1 + playsnd 10 # Misc\Explo1.wav imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) goto SpiderMineLocal00 @@ -7111,7 +7113,7 @@ IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] Unused3 [NONE] -StarEditInit PhalanxTankBaseStarEditInit +StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -7150,15 +7152,6 @@ PhalanxTankBaseWalking: playfram 0x22 goto PhalanxTankBaseWalking -PhalanxTankBaseStarEditInit: - setfldirect 12 - imgoluselo 251 2 0 # Phalanx (Tank) Turret (terran\tankt.grp) - wait 1 - imgul 252 0 0 # Phalanx (Tank) Base Shadow (terran\ttaShad.grp) - setfldirect 12 - playfram 0x00 - goto InfestedTerranWalkingToIdle - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 251 Phalanx (Tank) Turret (terran\tankt.grp) @@ -7222,7 +7215,7 @@ IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] Unused3 [NONE] -StarEditInit PhalanxSiegeBaseStarEditInit +StarEditInit [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -7268,10 +7261,6 @@ PhalanxSiegeBaseSpecialState2: sigorder 1 goto ScourgeLocal00 -PhalanxSiegeBaseStarEditInit: - imgoluselo 254 2 0 # Siege Tank (Siege) Turret (terran\stankt.grp) - goto PhalanxSiegeBaseInit - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 254 Phalanx (Siege) Turret (terran\stankt.grp) @@ -16991,7 +16980,6 @@ SpiderMineExplosionInit: goto SpiderMineExplosionInit SpiderMineExplosionDeath: - playsnd 10 # Misc\Explo1.wav playfram 0x00 wait 1 playfram 1 @@ -23667,7 +23655,7 @@ AirAttkInit GorgrokorGndAttkInit Unused1 [NONE] GndAttkRpt GorgrokorGndAttkInit AirAttkRpt GorgrokorGndAttkInit -CastSpell GorgrokorCastSpell +CastSpell [NONE] GndAttkToIdle GorgrokorWalkingToIdle AirAttkToIdle GorgrokorWalkingToIdle Unused2 [NONE] @@ -23710,7 +23698,7 @@ GorgrokorDeath: GorgrokorGndAttkInit: nobrkcodestart - playsndbtwn 1294 1295 # Gorgrokor weapon fire 01, 02 + playsndbtwn 1295 1296 # Gorgrokor weapon fire 01, 02 playfram 0x120 wait 1 playfram 0x140 @@ -23728,30 +23716,6 @@ GorgrokorGndAttkInit: nobrkcodeend gotorepeatattk goto GorgrokorWalkingToIdle - -GorgrokorCastSpell: - playfram 0x120 - wait 1 - nobrkcodestart - playfram 0x140 - wait 1 - playfram 0x160 - wait 2 - playfram 0x180 - wait 1 - playfram 0x1A0 - castspell - sigorder 2 - wait 1 - playfram 0x1C0 - wait 2 - playfram 0x1A0 - wait 2 - playfram 0x180 - wait 1 - nobrkcodeend - gotorepeatattk - goto GorgrokorWalkingToIdle GorgrokorWalking: playfram 0x20 @@ -24468,24 +24432,24 @@ ParasiteOverlayDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1006 Madrigal (cm\terran\madrigal.grp) +# 1006 Madrigal Imperioso Mode (cm\terran\madrigal.grp) .headerstart IsId 424 Type 21 -Init MadrigalInit -Death MadrigalDeath -GndAttkInit MadrigalGndAttkInit -AirAttkInit MadrigalGndAttkInit -Unused1 MadrigalUnused1 -GndAttkRpt MadrigalGndAttkInit -AirAttkRpt MadrigalGndAttkInit +Init MadrigalImperiosoBaseInit +Death MadrigalImperiosoBaseDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 MadrigalImperiosoBaseUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] CastSpell [NONE] -GndAttkToIdle MadrigalWalkingToIdle -AirAttkToIdle MadrigalWalkingToIdle +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] Unused2 [NONE] -Walking MadrigalWalking -WalkingToIdle MadrigalWalkingToIdle -SpecialState1 MadrigalSpecialState1 +Walking MadrigalImperiosoBaseWalking +WalkingToIdle MadrigalImperiosoBaseWalkingToIdle +SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] @@ -24497,24 +24461,17 @@ WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -MadrigalInit: +MadrigalImperiosoBaseInit: imgul 1033 0 7 # Madrigal Shadow (cm\terran\madrigal.grp) -MadrigalWalkingToIdle: - setvertpos 0 +MadrigalImperiosoBaseWalkingToIdle: + setvertpos 0 playfram 0x00 - wait 1 -MadrigalLocal00: - setvertpos 0 - wait 8 - setvertpos 0 - wait 8 - setvertpos -1 - wait 8 - setvertpos 0 - wait 8 - goto MadrigalLocal00 + wait 1 +MadrigalImperiosoBaseLocal00: + wait 125 + goto MadrigalImperiosoBaseLocal00 -MadrigalDeath: +MadrigalImperiosoBaseDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 1497 0 0 # Madrigal Death wait 3 @@ -24522,7 +24479,7 @@ MadrigalDeath: wait 1 end -MadrigalUnused1: +MadrigalImperiosoBaseUnused1: wait 1 nobrkcodestart playsnd 1699 @@ -24530,44 +24487,196 @@ MadrigalUnused1: wait 12 setfldirect 13 nobrkcodeend - goto MadrigalWalkingToIdle + goto MadrigalImperiosoBaseWalkingToIdle -MadrigalGndAttkInit: - wait 1 - nobrkcodestart - playfram 0x00 - wait 1 - playfram 0x20 - playsndbtwn 1208 1211 # Madrigal weaponfire 01, 02, 03, 04 - attack - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk - goto MadrigalWalkingToIdle - -MadrigalSpecialState1: - wait 1 - nobrkcodestart - playfram 0x00 - wait 1 - playfram 0x20 - attack - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk - goto MadrigalWalkingToIdle - -MadrigalWalking: +MadrigalImperiosoBaseWalking: setvertpos 0 - goto MadrigalLocal01 + goto MadrigalImperiosoBaseLocal01 -MadrigalLocal01: +MadrigalImperiosoBaseLocal01: wait 125 - goto MadrigalLocal01 + goto MadrigalImperiosoBaseLocal01 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1742 Madrigal (Imperioso) Turret (cm\terran\madrigal-turret.grp) +.headerstart +IsId 747 +Type 13 +Init MadrigalImperiosoTurretInit +Death ScourgeExplosionDeath +GndAttkInit MadrigalImperiosoTurretGndAttkInit +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt MadrigalImperiosoTurretGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking ScourgeLocal00 +WalkingToIdle ScourgeLocal00 +SpecialState1 ScourgeLocal00 +.headerend +# ----------------------------------------------------------------------------- # + +MadrigalImperiosoTurretInit: + playfram 0x20 + goto MadrigalImperiosoBaseLocal00 + +MadrigalImperiosoTurretGndAttkInit: + wait 1 + nobrkcodestart + wait 1 + playfram 0x00 + playsndbtwn 1208 1211 # Madrigal weaponfire 01, 02, 03, 04 + attackwith 1 + playfram 0x20 + wait 1 + nobrkcodeend + gotorepeatattk + goto MadrigalImperiosoBaseLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1743 Madrigal (Furia) Base (cm\terran\madrigal-base.grp) +.headerstart +IsId 748 +Type 23 +Init MadrigalFuriaBaseInit +Death MadrigalImperiosoBaseDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 MadrigalImperiosoBaseUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 MadrigalFuriaBaseSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MadrigalFuriaBaseInit: + imgul 1033 0 2 # Madrigal Shadow (cm\terran\madrigal.grp) + wait 1 + setflspeed 0 + playfram 0x00 + wait 1 + playsnd 2196 # Madrigal switch 01 + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 10 + sigorder 1 + goto ScourgeLocal00 + +MadrigalFuriaBaseUnused1: + wait 1 + nobrkcodestart + playsnd 1699 # Phalanx revive 01 + sprol 744 0 0 # Medium orange explosion reversed + playfram 5 + wait 12 + nobrkcodeend + goto ScourgeLocal00 + +MadrigalFuriaBaseSpecialState2: + wait 10 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + sigorder 1 + goto ScourgeLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1744 Madrigal (Furia) Turret (cm\terran\madrigal-turret.grp) +.headerstart +IsId 749 +Type 14 +Init MadrigalFuriaTurretInit +Death ScourgeExplosionDeath +GndAttkInit MadrigalFuriaTurretGndAttkInit +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt MadrigalFuriaTurretGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle ScourgeLocal00 +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle ScourgeLocal00 +SpecialState1 ScourgeLocal00 +SpecialState2 MadrigalFuriaTurretSpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MadrigalFuriaTurretInit: + playfram 0x20 + wait 1 + nobrkcodestart + wait 10 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + nobrkcodeend + goto ScourgeLocal00 + +MadrigalFuriaTurretGndAttkInit: + wait 1 + nobrkcodestart + playfram 0x100 + attackwith 1 + playfram 0xE0 + wait 1 + nobrkcodeend + gotorepeatattk + goto ScourgeLocal00 + +MadrigalFuriaTurretSpecialState2: + wait 1 + playsnd 2197 # Madrigal switch 02 + playfram 0xC0 + wait 1 + playfram 0xA0 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 1 + playfram 0x20 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -27491,118 +27600,47 @@ ApostleInit: ApostleWalkingToIdle: playfram 0x00 ApostleLocal00: - wait 1 - waitrand 62 128 - randcondjmp 128 ApostleLocal01 - randcondjmp 25 ApostleLocal02 - goto ApostleLocal00 - -ApostleLocal01: - playfram 0x11 - wait 2 - playfram 0x22 - randcondjmp 192 ApostleLocal03 - 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 - playfram 0x11 - wait 2 - playfram 0x00 - goto ApostleLocal00 - -ApostleLocal03: - waitrand 10 34 - goto ApostleLocal04 - -ApostleLocal04: - waitrand 10 34 - goto ApostleLocal00 - -ApostleLocal02: - waitrand 10 34 - playfram 0x22 - wait 1 - playfram 0x00 - wait 1 - turnrand 3 - wait 1 - playfram 0x22 - wait 1 + wait 125 goto ApostleLocal00 ApostleDeath: playsnd 1301 # Apostle death 01 - setfldirect 0 - playfram 0xdd - wait 2 - playfram 222 - wait 2 - playfram 223 - wait 2 - playfram 224 - wait 2 - playfram 225 - wait 2 - playfram 226 - wait 2 - playfram 227 - wait 2 - playfram 228 - wait 2 + setfldirect 0 + playfram 0x00 + imgol 3 0 0 # Scourge Death (zerg\zavDeath.grp) + wait 5 lowsprul 565 0 0 # Apostle Remnants (cm\terran\apostle-death.grp) wait 1 end ApostleGndAttkInit: - playfram 0x00 - wait 1 - playfram 0x11 + playfram 0x100 wait 1 - playfram 0x22 + playfram 0x120 + wait 1 + playfram 0x140 ApostleGndAttkRpt: wait 1 nobrkcodestart - attackwith 1 - playsndbtwn 689 693 - playfram 0xcc + playsndbtwn 689 693 # Apostle weaponfire 01, 02, 03, 04, 05 + attack + playfram 0x1A0 wait 1 - playfram 0x22 - wait 1 - playfram 0xcc - wait 1 - playfram 0x22 + playfram 0x180 + wait 1 + playfram 0x1A0 wait 1 + playfram 0x180 nobrkcodeend gotorepeatattk ignorerest ApostleGndAttkToIdle: - playfram 0x22 - wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x100 + wait 1 goto ApostleWalkingToIdle ApostleCastSpell: @@ -27626,36 +27664,29 @@ ApostleCastSpell: goto ApostleWalkingToIdle ApostleWalking: - move 4 - wait 1 - playfram 0x33 - move 4 - wait 1 - playfram 0x44 - move 4 - wait 1 - playfram 0x55 - move 4 - wait 1 - playfram 0x66 - move 4 - wait 1 - playfram 0x77 - move 4 - wait 1 - playfram 0x88 - move 4 - wait 1 - playfram 0x99 - move 4 - wait 1 - playfram 0xaa - move 4 - wait 1 - playfram 0xbb + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + 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 0x20 + move 4 + wait 1 goto ApostleWalking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1118 Apostle Remnants (cm\terran\apostle-death.grp) @@ -34870,7 +34901,7 @@ AlmaksaliskUnused1: AlmaksaliskGndAttkInit: wait 1 nobrkcodestart - playsndbtwn 1298 1299 # Almaksalisk weaponfire 01, 02 + playsndbtwn 1299 1300 # Almaksalisk weaponfire 01, 02 sproluselo 332 0 # Needle Spines (thingy\spooge.grp) attackwith 1 wait 2 @@ -34896,100 +34927,6 @@ AlmaksaliskWalking: wait 1 goto AlmaksaliskWalking -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1288 Quazil Quay (cm\zerg\quazilquay.grp) -.headerstart -IsId 548 -Type 20 -Init QuazilQuayInit -Death QuazilQuayDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt QuazilQuayAlmostBuilt -Built QuazilQuayBuilt -Landing [NONE] -LiftOff [NONE] -IsWorking QuazilQuayIsWorking -WorkingToIdle QuazilQuayWorkingToIdle -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -QuazilQuayInit: - playfram 0x00 # Frame set 0 - imgul 1289 0 0 # Quazil Quay Shadow (cm\zerg\quazilquay-shad.grp) - goto QuazilQuayWorkingToIdle - -QuazilQuayWorkingToIdle: - playfram 0x00 # Frame set 0 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 4 # Frame set 0, direction 3 - wait 2 - playfram 5 # Frame set 0, direction 3 - wait 2 - goto QuazilQuayWorkingToIdle - -QuazilQuayDeath: - playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) - wait 1 - end - -QuazilQuayAlmostBuilt: - imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) - playfram 0x00 # Frame set 0 - goto QuazilQuayBuilt - -QuazilQuayBuilt: - playfram 0x00 # Frame set 0 - wait 2 - goto QuazilQuayWorkingToIdle - -QuazilQuayIsWorking: - playfram 0x00 - wait 1 - playfram 1 - wait 1 - playfram 2 - wait 1 - playfram 3 - wait 1 - playfram 4 - wait 1 - playfram 5 - waitrand 1 2 - playfram 4 - wait 1 - playfram 3 - wait 1 - playfram 2 - wait 1 - playfram 1 - wait 1 - playfram 0x00 - waitrand 1 3 - goto QuazilQuayIsWorking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1282 Zoryusthaleth (cm\zerg\zoryusthaleth.grp) @@ -38149,7 +38086,7 @@ KonviliskGndAttkInit: playfram 0x33 wait 1 playfram 0x44 - playsndbtwn 1296 1297 # Konvilisk weapon fire 01, 02 + playsndbtwn 1297 1298 # Konvilisk weapon fire 01, 02 sproluselo 332 0 # Needle Spines (thingy\spooge.grp) attack wait 1 @@ -38253,7 +38190,7 @@ Death LegionnaireTeleportDeath # ----------------------------------------------------------------------------- # LegionnaireTeleportInit: - playsndbtwn 1288 1291 # Legionnaire teleport 01, 02, 03, 04 + playsndbtwn 1289 1292 # Legionnaire teleport 01, 02, 03, 04 playfram 0x00 wait 2 playfram 1 @@ -46351,33 +46288,33 @@ ZarcavrokorWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1226 Shaman (cm\terran\shaman.grp) +# 1226 Shaman Support Mode (cm\terran\shaman.grp) .headerstart IsId 688 Type 13 -Init ShamanInit -Death ShamanDeath -GndAttkInit ShamanGndAttkInit -AirAttkInit ShamanGndAttkInit -Unused1 ShamanUnused1 -GndAttkRpt ShamanGndAttkInit -AirAttkRpt ShamanGndAttkInit -CastSpell ShamanCastSpell -GndAttkToIdle ShamanGndAttkToIdle -AirAttkToIdle ShamanGndAttkToIdle +Init ShamanSupportModeInit +Death ShamanSupportModeDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 ShamanSupportModeUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell ShamanSupportModeCastSpell +GndAttkToIdle ShamanSupportModeGndAttkToIdle +AirAttkToIdle ShamanSupportModeGndAttkToIdle Unused2 [NONE] -Walking ShamanWalking -WalkingToIdle ShamanGndAttkToIdle -SpecialState1 ShamanSpecialState1 +Walking ShamanSupportModeWalking +WalkingToIdle ShamanSupportModeGndAttkToIdle +SpecialState1 ShamanSupportModeSpecialState1 .headerend # ----------------------------------------------------------------------------- # -ShamanInit: - imgul 1227 0 6 # Shaman Shadow (cm\terran\shaman-shadow.grp) +ShamanSupportModeInit: + imgul 1227 0 4 # Shaman Shadow (cm\terran\shaman-shadow.grp) playfram 0x00 - goto ShamanGndAttkToIdle + goto ShamanSupportModeGndAttkToIdle -ShamanGndAttkToIdle: +ShamanSupportModeGndAttkToIdle: playfram 0x00 setvertpos 1 wait 8 @@ -46387,55 +46324,35 @@ ShamanGndAttkToIdle: wait 8 setvertpos 0 wait 8 - goto ShamanGndAttkToIdle + goto ShamanSupportModeGndAttkToIdle -ShamanDeath: - playsndbtwn 986 987 # Terran\Duran\TDnPss06.wav | Terran\Duran\TDnPss07.wav - imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) +ShamanSupportModeDeath: + playsndbtwn 986 987 # Shaman Death 01, 02 (replace these!) + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 lowsprul 821 0 0 # Shaman Remains end -ShamanUnused1: +ShamanSupportModeUnused1: wait 1 nobrkcodestart - playsndbtwn 1705 1706 - sprol 742 0 0 + playsndbtwn 1705 1706 # Shaman Death Reversed 01, 02 + sprol 742 0 0 # Orange Explosion Medium Reversed setfldirect 12 wait 12 nobrkcodeend - goto ShamanGndAttkToIdle + goto ShamanSupportModeGndAttkToIdle -ShamanGndAttkInit: +ShamanSupportModeCastSpell: playfram 0x00 - wait 1 - playfram 0x33 - attackwith 1 - playsnd 1016 # Terran\Medic\TMedflsh.wav - gotorepeatattk - goto ShamanGndAttkToIdle + wait 6 + goto ShamanSupportModeGndAttkToIdle -ShamanCastSpell: - wait 1 - imgol 968 0 0 # Restoration Hit (Medium) (thingy\tCureMed.grp) - playfram 0x33 - wait 1 - playfram 0x00 - wait 1 - playfram 0x33 - wait 1 - playfram 0x00 - wait 1 - playfram 0x33 - wait 1 - playfram 0x00 - goto ShamanGndAttkToIdle - -ShamanWalking: +ShamanSupportModeWalking: setvertpos 0 goto InfestedTerranLocal00 -ShamanSpecialState1: +ShamanSupportModeSpecialState1: attackwith 1 sigorder 1 wait 1 @@ -51909,4 +51826,126 @@ PhantomStrikeProcInit: playfram 3 PhantomStrikeProcDeath: wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1739 Shaman Visionary Mode (cm\terran\shaman.grp) +.headerstart +IsId 745 +Type 23 +Init ShamanVisionaryModeInit +Death ShamanVisionaryModeDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 ShamanVisionaryModeUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell ShamanVisionaryModeGndAttkToIdle +GndAttkToIdle ShamanVisionaryModeGndAttkToIdle +AirAttkToIdle ShamanVisionaryModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 ShamanVisionaryModeSpecialState2 +SpecialState2 ShamanVisionaryModeSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ShamanVisionaryModeInit: + imgul 1227 0 0 # Shaman Shadow (cm\terran\shaman-shadow.grp) + wait 1 + playsnd 2429 # Shaman Visionary Transform + setflspeed 0 + playfram 0x00 + wait 2 + playfram 0x20 + wait 1 + playfram 0x40 + wait 3 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + sigorder 1 + goto ShamanVisionaryModeGndAttkToIdle + +ShamanVisionaryModeGndAttkToIdle: + playfram 0xE0 + wait 2 + 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 + goto ShamanVisionaryModeGndAttkToIdle + +ShamanVisionaryModeDeath: + playsndbtwn 1385 1386 # Matador 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 + +ShamanVisionaryModeUnused1: + 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 ShamanVisionaryModeGndAttkToIdle + +ShamanVisionaryModeSpecialState2: + playsnd 2430 # Matador Tank Transform + playfram 0xC0 + wait 1 + playfram 0xA0 + wait 1 + playfram 0x80 + wait 1 + playfram 0x60 + wait 3 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + sigorder 1 + goto InfestedTerranLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1740 Terran Cancel Structure (thingy\tmnExplo.grp) +.headerstart +IsId 746 +Type 1 +Init SpiderMineExplosionDeath +Death ScourgeExplosionDeath +.headerend +# ----------------------------------------------------------------------------- # \ No newline at end of file diff --git a/mpq/sound/cm/p/_building/cancel-protoss-01.wav b/mpq/sound/cm/p/_building/cancel-protoss-01.wav new file mode 100644 index 00000000..8d60a23a Binary files /dev/null and b/mpq/sound/cm/p/_building/cancel-protoss-01.wav differ diff --git a/mpq/sound/cm/t/_building/cancel-terran-01.wav b/mpq/sound/cm/t/_building/cancel-terran-01.wav new file mode 100644 index 00000000..95278ce6 Binary files /dev/null and b/mpq/sound/cm/t/_building/cancel-terran-01.wav differ diff --git a/mpq/sound/cm/t/apostle/toggle-01.wav b/mpq/sound/cm/t/apostle/toggle-01.wav new file mode 100644 index 00000000..4f1f7dfa Binary files /dev/null and b/mpq/sound/cm/t/apostle/toggle-01.wav differ diff --git a/mpq/sound/cm/t/apostle/toggle-02.wav b/mpq/sound/cm/t/apostle/toggle-02.wav new file mode 100644 index 00000000..27ae0c49 Binary files /dev/null and b/mpq/sound/cm/t/apostle/toggle-02.wav differ diff --git a/mpq/sound/cm/t/apostle/toggle-03.wav b/mpq/sound/cm/t/apostle/toggle-03.wav new file mode 100644 index 00000000..8653a843 Binary files /dev/null and b/mpq/sound/cm/t/apostle/toggle-03.wav differ diff --git a/mpq/sound/cm/t/madrigal/sw-01.wav b/mpq/sound/cm/t/madrigal/sw-01.wav index 379d2998..cd0e794b 100644 Binary files a/mpq/sound/cm/t/madrigal/sw-01.wav and b/mpq/sound/cm/t/madrigal/sw-01.wav differ diff --git a/mpq/sound/cm/t/shaman/switch-01.wav b/mpq/sound/cm/t/shaman/switch-01.wav new file mode 100644 index 00000000..2bd674bb Binary files /dev/null and b/mpq/sound/cm/t/shaman/switch-01.wav differ diff --git a/mpq/sound/cm/t/shaman/switch-02.wav b/mpq/sound/cm/t/shaman/switch-02.wav new file mode 100644 index 00000000..5da2626b Binary files /dev/null and b/mpq/sound/cm/t/shaman/switch-02.wav differ diff --git a/mpq/sound/cm/t/shaman/switch-03.wav b/mpq/sound/cm/t/shaman/switch-03.wav new file mode 100644 index 00000000..69696d56 Binary files /dev/null and b/mpq/sound/cm/t/shaman/switch-03.wav differ diff --git a/mpq/sound/protoss/templar/ptepss01.wav b/mpq/sound/protoss/templar/ptepss01.wav new file mode 100644 index 00000000..e13a7bb4 Binary files /dev/null and b/mpq/sound/protoss/templar/ptepss01.wav differ diff --git a/mpq/sound/protoss/templar/ptepss02.wav b/mpq/sound/protoss/templar/ptepss02.wav new file mode 100644 index 00000000..b0fb9148 Binary files /dev/null and b/mpq/sound/protoss/templar/ptepss02.wav differ diff --git a/mpq/sound/protoss/templar/ptepss03.wav b/mpq/sound/protoss/templar/ptepss03.wav new file mode 100644 index 00000000..df83db90 Binary files /dev/null and b/mpq/sound/protoss/templar/ptepss03.wav differ diff --git a/mpq/sound/terran/ghost/tghpss02.wav b/mpq/sound/terran/ghost/tghpss02.wav new file mode 100644 index 00000000..764ae642 Binary files /dev/null and b/mpq/sound/terran/ghost/tghpss02.wav differ diff --git a/mpq/sound/terran/ghost/tghpss03.wav b/mpq/sound/terran/ghost/tghpss03.wav new file mode 100644 index 00000000..315564fc Binary files /dev/null and b/mpq/sound/terran/ghost/tghpss03.wav differ diff --git a/mpq/sound/terran/tank/ttapss01.wav b/mpq/sound/terran/tank/ttapss01.wav new file mode 100644 index 00000000..9598caf4 Binary files /dev/null and b/mpq/sound/terran/tank/ttapss01.wav differ diff --git a/mpq/unit/cm/terran/apostle-shad.grp b/mpq/unit/cm/terran/apostle-shad.grp deleted file mode 100644 index 816a5c55..00000000 Binary files a/mpq/unit/cm/terran/apostle-shad.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/apostle-shadow.grp b/mpq/unit/cm/terran/apostle-shadow.grp new file mode 100644 index 00000000..5717f203 Binary files /dev/null and b/mpq/unit/cm/terran/apostle-shadow.grp differ diff --git a/mpq/unit/cm/terran/apostle.grp b/mpq/unit/cm/terran/apostle.grp index 04444246..7ab757e0 100644 Binary files a/mpq/unit/cm/terran/apostle.grp and b/mpq/unit/cm/terran/apostle.grp differ diff --git a/mpq/unit/cm/terran/madrigal-base.grp b/mpq/unit/cm/terran/madrigal-base.grp new file mode 100644 index 00000000..a1517200 Binary files /dev/null and b/mpq/unit/cm/terran/madrigal-base.grp differ diff --git a/mpq/unit/cm/terran/madrigal-shad.grp b/mpq/unit/cm/terran/madrigal-shad.grp deleted file mode 100644 index 8844ab92..00000000 Binary files a/mpq/unit/cm/terran/madrigal-shad.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/madrigal-shadow.grp b/mpq/unit/cm/terran/madrigal-shadow.grp new file mode 100644 index 00000000..7d4639d9 Binary files /dev/null and b/mpq/unit/cm/terran/madrigal-shadow.grp differ diff --git a/mpq/unit/cm/terran/madrigal-turret.grp b/mpq/unit/cm/terran/madrigal-turret.grp new file mode 100644 index 00000000..6411927f Binary files /dev/null and b/mpq/unit/cm/terran/madrigal-turret.grp differ diff --git a/mpq/unit/cm/terran/madrigal-turret.lol b/mpq/unit/cm/terran/madrigal-turret.lol new file mode 100644 index 00000000..559773ab Binary files /dev/null and b/mpq/unit/cm/terran/madrigal-turret.lol differ diff --git a/mpq/unit/cm/terran/madrigal.grp b/mpq/unit/cm/terran/madrigal.grp deleted file mode 100644 index e922a7a9..00000000 Binary files a/mpq/unit/cm/terran/madrigal.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/shaman-shadow.grp b/mpq/unit/cm/terran/shaman-shadow.grp index 6b1e0d6a..4b3bc94b 100644 Binary files a/mpq/unit/cm/terran/shaman-shadow.grp and b/mpq/unit/cm/terran/shaman-shadow.grp differ diff --git a/mpq/unit/cm/terran/shaman.grp b/mpq/unit/cm/terran/shaman.grp index 6fd9687c..53b00610 100644 Binary files a/mpq/unit/cm/terran/shaman.grp and b/mpq/unit/cm/terran/shaman.grp differ diff --git a/mpq/unit/cm/zerg/vilgoleth.grp b/mpq/unit/cm/zerg/vilgoleth.grp new file mode 100644 index 00000000..37b234da Binary files /dev/null and b/mpq/unit/cm/zerg/vilgoleth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 7c2479a1..3496aaee 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 e4cf3947..35b7445d 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 f5b63e59..20be978a 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 090180d7..c6f4b815 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 408641ed..993fb651 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,32 +1,30 @@ # XX May 2023 - prospective patch notes ## Designer's Notes -We have increased worker training times as another means of testing a slower scaling for the early-game. It should also help to leave more room for "flow" inside early build orders, while increasing the value of parallel worker queues. +Vespene return rates have been adjusted to allow for more spending on units in all stages of the game - hopefully without tech tier ascension happening too early. + +Worker training times have also increased as another means of testing a slower scaling for the early-game. It should also help to leave more room for "flow" inside the early stages of build orders, while also raising the value of parallel worker queues. A stat adjustment has occurred with the aim of creating a game state with higher time-to-kill than what has hitherto been seen within Cosmonarchy Brood War. We believe this shift will create a less-volatile game at all stages of all matchups, and allow for individual mistakes to be less about losing the game and more about ceding advantages to your opponent - which will, of course, eventually lose you the game! -Just like every other large-scale change we have attempted recently, this will be tinkered with and evaluated over time, but we are excited to achieve a game state that allows for more measured play and less coin-flip interactions. +More cornerstones have been deployed or revised, and you can view them all on the website in a nifty new section of the techtree maps! -We will revise reclamation (and other corpse interactions), as well as Vulture mine-laying, in the next release. Stay tuned! +Just like all other large-scale changes we have attempted recently, these will all be tinkered with and evaluated over time, but we are excited to achieve a game state that allows for more measured play and less coin-flip interactions... and this game state shall be featured in a forthcoming 1v1 tournament sometime in June! -## Gameplay +## Gameplay (many changes c. Veeq7) - Vespene return rates have been adjusted: - Ridges now return 4, from 3 - Uncapped Geysers now return 6, from 4 - Tier 2 refineries now return 8, from 6 - Tier 3 refineries are new, and return 10 - Corpses now decay after 15 seconds, at which point they are no longer viable for consumption -- Units reclaimed by Terrans now have their HP decay by 5 points per second unless a Reclaimer is within that Reclaimer's vision range - - Reclaimer units are: Apostle, Autocrat, Anticthon, Aion - - All reclamation abilities have been adjusted -- Zerg regression now applies to units, and structures regress to Droleths (c. Veeq7) - - If structures were produced by Gosvileths, they do not regress - The melee weapons of the following units have had their ranges mildly adjusted, with the aim of improving responsivity: - Zealot, Cabalist, Pariah, Golem, Zethrokor, Vorvrokor, Nathrokor, Gorgrokor, Rilirokor, Ultrokor -- Healing no longer cleanses debuffs (intended to be removed a lot earlier... c. Veeq7) +- Healing to full HP no longer cleanses debuffs - During construction, Masons and Taloses now move in a predictable pattern (c. DarkenedFantasies) ## Bugfixes +- Trapped units no longer return minerals or enter Nyduses (c. DarkenedFantasies) - Many wandering corner cases have been found and fixed (c. Veeq7) - Range changes now correctly apply to attacks which go to max range, and many max range corner cases have been found and fixed (c. Veeq7) - Ground workers now use ground distance when returning resources (c. Veeq7) @@ -41,7 +39,10 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - A very obscure crash when using ALT-F4 to close the game while the 'save replay' dialog is open has been fixed (c. DarkenedFantasies) ## Audiovisuals +- Terran and Protoss cancellation is now indicated by new (placeholder) audiovisuals - New sprite for: + - Madcap (material updates) + - Apostle (model replacement) - Matador (new details and deployment animation) - Phalanx (siege mode now turns c. DarkenedFantasies) - Aion (material updates, attack animation) @@ -57,7 +58,8 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - Cataphract (weaponfire) - Konvilisk (weaponhit) - New unit responses for: - - Savant, Madcap, Heracles, Siren, Striga, Anticthon + - Savant, Madcap, Heracles, Siren, Striga, Anticthon (replacements) + - Shaman, Eidolon, Apostle, Phalanx, Cantavis, Mind Tyrant, Didact (ability usage) ## UI - When allies are under attack, placeholder alerts are now played (c. Veeq7) @@ -69,6 +71,14 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - A new emoji has been added to the font (c. DarkenedFantasies) ## Terran +- **Cornerstones:** + - Apollyoid Adhesive: + - Now rends 1 armor per stack + - No longer deals damage + - Reclamation: + - Reclaimed units now have their HP decay by 5 points per second unless a Reclaimer is within that Reclaimer's vision range + - Reclaimer units are: Apostle, Autocrat, Anticthon, Aion + - All reclamation abilities have been adjusted - [Mason](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/mason): - Time cost now 15, from 12 - [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos): @@ -232,9 +242,17 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - Babylon Plating now gives 4 armor to Tank Mode and 0 armor to Siege Mode - [Madrigal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx): - Armor now 1, from 2 + - Imperioso Missiles: + - Now the default weapon + - Armor penetration now 4, from 5 + - Now benefits from Kinetic Penetration - Furia Missiles: + - Damage now 8, from 12 - Armor penetration now 0, from 1 - - Cooldown now 1 second, from 0.916 + - Cooldown now 0.833, from 0.916 + - Weapon range now 6, from 4 + - **NEW:** Tempo Servos + - Now deploys into Furia Mode, trading mobility for crowd-control - [Ramesses](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ramesses): - Mineral cost now 200, from 225 - HP now 100, from 120 @@ -404,6 +422,11 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - Gas cost now 75, from 50 ## Protoss +- **Cornerstones:** + - **Vengeful Ascension:** + - Certain Protoss units either avenge or ascend corpses, buffing allies within the fallen unit's vision range for 3 seconds + - Avenging a corpse grants 25% movement speed + - Ascending a corpse grants 25% attack speed - [Scribe](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/scribe): - Time cost now 15, from 12 - [Envoy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/envoy): @@ -653,6 +676,9 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - HP now 250, from 300 - Shields now 250, from 150 - Armor now 4, from 6 +- **NEW:** [Analogue](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/analogue): + - Durable disruption drone with detection and a retaliation passive + - Assembled at [Ardent Authority](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ardent-authority) - [Nexus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/nexus): - Time cost now 80, from 75 - HP now 850, from 750 @@ -669,6 +695,14 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - Time cost now 50, from 45 ## Zerg +- **Cornerstones**: + - Regression + - Now applies to mutated units + - If units were mutated from Ocsal Larvae, they do not regress + - Broodspawn + - Rilirokors and Rililisks now have 5 seconds of timed life when not within a Sire's vision range + - Sire units are: Zoryusthaleth, Konvilisk, Vilgorokor, Vilgoleth, Matraleth, Tetcaerokor + - All related abilities have been adjusted - [Larva](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/larva): - Spawn rate now ~12 seconds, from ~10 seconds - [Droleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/droleth): @@ -837,6 +871,8 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - [Isthrathaleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/isthrathaleth): - HP now 120, from 100 - Armor now 4, from 2 +- **NEW:** [Vilgoleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vilgoleth): + - Reinforcing host, spawned by Matraleths and from dying Vilgorokors - [Hachirosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hachirosk): - HP now 1300, from 1200 - Time cost now 65, from 60 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 78adc9e7..638f7568 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ