diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index 9676d2b4..50ec43db 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 93ebb493..56735f8d 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 fd77e10a..5914f5c0 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -463,7 +463,7 @@ Police Intern Ezigrisant Wellbore Police Deputy -Police WAT Trooper +Cuirass (Trench Mode) Spirtith Colony Skortrith Colony Empress Plasma @@ -477,7 +477,7 @@ Ocsal Larva Burst Lasers Red Small Burst Lasers Red Phalanx Mortar -Extended Flingy #271 +Matador (Cinder Mode) Extended Flingy #272 Extended Flingy #273 Extended Flingy #274 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 0a927f4a..96b5e1a2 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 da6b1b79..b04c9348 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 d424a9ca..8847e000 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1521,7 +1521,7 @@ Tyranny Stun Small Tyranny Stun Medium Tyranny Stun Large Tyranny Stun XLarge -Matador +Matador (Tank Mode) Fusion Cutter Hit Damageless Axitrilisk Birth Akistrokor Birth @@ -1531,7 +1531,7 @@ Seeker Spores Double Silent Kagralisk Kagralisk Shadow Kagralisk Remnants -Matador Shadow +Matador (Tank Mode) Shadow Kagralisk Weaponhit Izkag Iteth Izkag Iteth Shadow @@ -1694,8 +1694,8 @@ Wellbore Shadow Wellbore Overlay Police Deputy Police Deputy Shadow -Police WAT Trooper -Police WAT Trooper Shadow +Cuirass (Trench Mode) +Cuirass (Trench Mode) Shadow Madrigal Dirge Proc Spirtith Colony Spirtith Colony Shadow @@ -1724,7 +1724,7 @@ Burst Lasers Impact Red Damageless Burst Lasers Silent Red Small Burst Lasers Silent Red Phalanx Mortar -Extended Image #724 +Matador (Cinder Mode) Extended Image #725 Extended Image #726 Extended Image #727 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 192ddc0f..830bdb76 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 be71c235..1fff00df 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -1495,7 +1495,7 @@ Wendigo Yes 01 Wendigo Yes 02 Wendigo Yes 03 Wendigo Yes 04 -Siren Ready 01 +unused Siren What 01 Siren What 02 Siren What 03 @@ -2401,34 +2401,34 @@ Protathalor Weaponhit 01 Protathalor Weaponhit 02 Protathalor Weaponhit 03 Protathalor Weaponhit 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 -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 +Savant Ready 01 +Savant Ready 02 +Savant Ready 03 +Savant Order Aggressive 01 +Savant Order Aggressive 02 +Savant Order Aggressive 03 +Savant Order Aggressive 04 +Savant Under Attack 01 +Savant Under Attack 02 +Savant Under Attack 03 +Savant Under Attack 04 +Savant Banter 01 +Savant Banter 02 +Savant Banter 03 +Savant Banter 04 +Siren Ready 01 +Siren Ready 02 +Siren Ready 03 +Siren Order Aggressive 01 +Siren Order Aggressive 02 +Siren Order Aggressive 03 +Siren Order Aggressive 04 +Siren Under Attack 01 +Siren Under Attack 02 +Siren Under Attack 03 +Siren Under Attack 04 +Matador Cinder Transform +Matador Tank Transform Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 14f4dc60..bba12a9b 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1477,7 +1477,7 @@ cm\t\autocrat\wf-02.wav cm\t\autocrat\wf-03.wav cm\t\autocrat\wf-04.wav cm\t\autocrat\wf-05.wav -cm\t\savant\ready-01.wav +caw.wav cm\t\savant\what-01.wav cm\t\savant\what-02.wav cm\t\savant\what-03.wav @@ -1495,7 +1495,7 @@ caw.wav caw.wav caw.wav caw.wav -cm\t\siren\rdy-01.wav +caw.wav cm\t\siren\wht-01.wav cm\t\siren\wht-02.wav cm\t\siren\wht-03.wav @@ -2400,4 +2400,32 @@ cm\z\kalkalisk\wh-03.wav cm\z\protathalor\wh-01.wav cm\z\protathalor\wh-02.wav cm\z\protathalor\wh-03.wav -cm\z\protathalor\wh-04.wav \ No newline at end of file +cm\z\protathalor\wh-04.wav +cm\t\savant\rdy-01.wav +cm\t\savant\rdy-02.wav +cm\t\savant\rdy-03.wav +cm\t\savant\agg-01.wav +cm\t\savant\agg-02.wav +cm\t\savant\agg-03.wav +cm\t\savant\agg-04.wav +cm\t\savant\hlp-01.wav +cm\t\savant\hlp-02.wav +cm\t\savant\hlp-03.wav +cm\t\savant\hlp-04.wav +cm\t\savant\bnt-01.wav +cm\t\savant\bnt-02.wav +cm\t\savant\bnt-03.wav +cm\t\savant\bnt-04.wav +cm\t\siren\rdy-01.wav +cm\t\siren\rdy-02.wav +cm\t\siren\rdy-03.wav +cm\t\siren\agg-01.wav +cm\t\siren\agg-02.wav +cm\t\siren\agg-03.wav +cm\t\siren\agg-04.wav +cm\t\siren\hlp-01.wav +cm\t\siren\hlp-02.wav +cm\t\siren\hlp-03.wav +cm\t\siren\hlp-04.wav +cm\t\matador\tr-01.wav +cm\t\matador\tr-02.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 6d55c274..906868d6 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 da9184df..83c37b8f 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -836,7 +836,7 @@ Police Intern Ezigrisant Wellbore Police Deputy -Police WAT Trooper +Cuirass (Trench Mode) Cuirass Stonewall Protocol Overlay Spirtith Colony Skortrith Colony @@ -860,7 +860,7 @@ Burst Lasers Impact Red Damageless Burst Lasers Red Small Burst Lasers Red Phalanx Mortar -Extended Sprite #1 +Matador (Cinder Mode) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 82397717..7910aa25 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 19dd73ac..83746037 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -6,7 +6,7 @@ Scanner Sweep (Comsat Station) Siege Mode (Phalanx) Defensive Matrix (Azazel) Irradiate (Seraph) -Yamato Cannon (Phobos) +Yamato Cannon (Magnetar) Select Assimilated (unused) Personnel Cloaking (unused) Burrowing (Zerg) diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index cd444db4..1fc28a8f 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 e08b787d..97641271 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -17,7 +17,7 @@ Terran Shaman Protoss Manifold Protoss Architect Terran Madcap -Terran Cuirass +Terran Cuirass (Tank Mode) Terran Talos Protoss Star Sovereign Terran Salamander @@ -254,7 +254,7 @@ Protoss Matrix Terran Sundog Terran Starpad Terran Ancile -Terran Matador +Terran Matador (Tank Mode) Terran Future Station Zerg Zarcavrokor Terran Quantum Institute @@ -369,8 +369,8 @@ Police Intern BTN Police Structure - Basic BTN Police Structure - Advanced Police Dugout -Police Deputy -Police WAT Trooper +Terran Matador (Cinder Mode) +Terran Cuirass (Trench Mode) Police Slapdash Police Barker Police Priestess diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 4e26c6d3..393f1457 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 da75e39d..d0057774 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -28,7 +28,7 @@ Twin Railguns (Cyprian) Arclite Shock Cannon (Phalanx, Siege) Monstrous Maw (Zoryusthaleth) Longbolt Missiles (Watchdog) -Yamato Cannon (Phobos ability) +Yamato Cannon (Magnetar ability) Nuclear Missile Lobotomy Mine (unused) EMP Shockwave (unused) @@ -199,7 +199,7 @@ Khaydarin Plasma Laser (Engram) Ion Cannon (Ion Cannon) Discoid Railgun (Savant, Piercing) Geometric Rifle (Sevenstep, Piercing) -Extended Weapon #72 +Twinstrike Cannons (Matador) Extended Weapon #73 Extended Weapon #74 Extended Weapon #75 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 6a70cdd5..455c571c 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 b42b962e..9a4a9d8c 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 2777485f..1b34d519 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 02d0be98..4f257785 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 1bac8d40..9d763f93 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -18493,34 +18493,6 @@ YamatoGunOverlayInit: wait 2 playfram 10 wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 8 - wait 2 - playfram 9 - wait 2 - playfram 10 - wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 8 - wait 2 - playfram 9 - wait 2 - playfram 10 - wait 2 playfram 0x00 wait 2 playfram 1 @@ -43288,7 +43260,7 @@ AirAttkInit MagnetarGndAttkInit Unused1 MagnetarUnused1 GndAttkRpt MagnetarGndAttkInit AirAttkRpt MagnetarGndAttkInit -CastSpell [NONE] +CastSpell MagnetarCastSpell GndAttkToIdle MagnetarGndAttkToIdle AirAttkToIdle MagnetarGndAttkToIdle Unused2 [NONE] @@ -43342,6 +43314,10 @@ MagnetarGndAttkInit: MagnetarLocal00: wait 125 goto MagnetarLocal00 + +MagnetarCastSpell: + imgolorig 543 # Yamato Gun Overlay (thingy\eycBlast.grp) + goto MagnetarLocal00 MagnetarWalking: setvertpos 0 @@ -46702,7 +46678,7 @@ SundogWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1523 Matador (cm\terran\matador.grp) +# 1523 Matador Tank Mode (cm\terran\matador.grp) .headerstart IsId 680 Type 13 @@ -46759,14 +46735,9 @@ MatadorGndAttkInit: wait 1 nobrkcodestart playfram 0x100 + attack playsndbtwn 2161 2163 # Matador weaponfire 01, 02, 03 - imgol 421 0 0 # FlameThrower (thingy\flamer.grp) - attkshiftproj 24 wait 1 - attkshiftproj 52 - wait 1 - attkshiftproj 80 - wait 3 playfram 0x00 wait 3 nobrkcodeend @@ -52215,4 +52186,111 @@ WellboreLocal01: creategasoverlays 0 wait 20 waitrand 5 100 - goto WellboreLocal01 \ No newline at end of file + goto WellboreLocal01 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1726 Matador Cinder Mode (cm\terran\matador.grp) +.headerstart +IsId 737 +Type 23 +Init MatadorCinderModeInit +Death MatadorCinderModeDeath +GndAttkInit MatadorCinderModeGndAttkInit +AirAttkInit MatadorCinderModeGndAttkInit +Unused1 MatadorCinderModeUnused1 +GndAttkRpt MatadorCinderModeGndAttkInit +AirAttkRpt MatadorCinderModeGndAttkInit +CastSpell [NONE] +GndAttkToIdle MatadorCinderModeGndAttkToIdle +AirAttkToIdle MatadorCinderModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 MatadorCinderModeSpecialState2 +SpecialState2 MatadorCinderModeSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MatadorCinderModeInit: + imgul 1533 0 0 # Matador Shadow (cm\terran\matador-shadow.grp) + wait 1 + playsnd 2429 # Matador Cinder Transform + setflspeed 0 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 6 + sigorder 1 + goto MatadorCinderModeGndAttkToIdle + +MatadorCinderModeGndAttkToIdle: + playfram 0x180 + goto MatadorCinderModeLocal00 + +MatadorCinderModeLocal00: + wait 125 + goto MatadorCinderModeLocal00 + +MatadorCinderModeDeath: + playsndbtwn 1385 1386 # Matador death 01, 02 + imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +MatadorCinderModeUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto MatadorCinderModeGndAttkToIdle + +MatadorCinderModeGndAttkInit: + playfram 0x180 + wait 1 + nobrkcodestart + playfram 0x1A0 + playsndbtwn 2161 2163 # Matador weaponfire 01, 02, 03 + imgol 421 0 0 # FlameThrower (thingy\flamer.grp) + attkshiftproj 24 + wait 1 + playfram 0x180 + attkshiftproj 52 + wait 1 + attkshiftproj 80 + wait 1 + playfram 0x180 + nobrkcodeend + gotorepeatattk + goto MatadorCinderModeGndAttkToIdle + +MatadorCinderModeSpecialState2: + playsnd 2430 # Matador Tank Transform + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 6 + sigorder 1 + goto InfestedTerranLocal00 \ No newline at end of file diff --git a/mpq/sound/cm/t/matador/tr-01.wav b/mpq/sound/cm/t/matador/tr-01.wav new file mode 100644 index 00000000..3a1dcedb Binary files /dev/null and b/mpq/sound/cm/t/matador/tr-01.wav differ diff --git a/mpq/sound/cm/t/matador/tr-02.wav b/mpq/sound/cm/t/matador/tr-02.wav new file mode 100644 index 00000000..23013f19 Binary files /dev/null and b/mpq/sound/cm/t/matador/tr-02.wav differ diff --git a/mpq/sound/cm/t/savant/agg-01.wav b/mpq/sound/cm/t/savant/agg-01.wav new file mode 100644 index 00000000..b17dc701 Binary files /dev/null and b/mpq/sound/cm/t/savant/agg-01.wav differ diff --git a/mpq/sound/cm/t/savant/agg-02.wav b/mpq/sound/cm/t/savant/agg-02.wav new file mode 100644 index 00000000..27e64474 Binary files /dev/null and b/mpq/sound/cm/t/savant/agg-02.wav differ diff --git a/mpq/sound/cm/t/savant/agg-03.wav b/mpq/sound/cm/t/savant/agg-03.wav new file mode 100644 index 00000000..9cacec2a Binary files /dev/null and b/mpq/sound/cm/t/savant/agg-03.wav differ diff --git a/mpq/sound/cm/t/savant/agg-04.wav b/mpq/sound/cm/t/savant/agg-04.wav new file mode 100644 index 00000000..f6e2f9ea Binary files /dev/null and b/mpq/sound/cm/t/savant/agg-04.wav differ diff --git a/mpq/sound/cm/t/savant/bnt-01.wav b/mpq/sound/cm/t/savant/bnt-01.wav new file mode 100644 index 00000000..96da0610 Binary files /dev/null and b/mpq/sound/cm/t/savant/bnt-01.wav differ diff --git a/mpq/sound/cm/t/savant/bnt-02.wav b/mpq/sound/cm/t/savant/bnt-02.wav new file mode 100644 index 00000000..97ebcc4f Binary files /dev/null and b/mpq/sound/cm/t/savant/bnt-02.wav differ diff --git a/mpq/sound/cm/t/savant/bnt-03.wav b/mpq/sound/cm/t/savant/bnt-03.wav new file mode 100644 index 00000000..95de3efa Binary files /dev/null and b/mpq/sound/cm/t/savant/bnt-03.wav differ diff --git a/mpq/sound/cm/t/savant/bnt-04.wav b/mpq/sound/cm/t/savant/bnt-04.wav new file mode 100644 index 00000000..ef293a43 Binary files /dev/null and b/mpq/sound/cm/t/savant/bnt-04.wav differ diff --git a/mpq/sound/cm/t/savant/hlp-01.wav b/mpq/sound/cm/t/savant/hlp-01.wav new file mode 100644 index 00000000..550a868f Binary files /dev/null and b/mpq/sound/cm/t/savant/hlp-01.wav differ diff --git a/mpq/sound/cm/t/savant/hlp-02.wav b/mpq/sound/cm/t/savant/hlp-02.wav new file mode 100644 index 00000000..ffa16b47 Binary files /dev/null and b/mpq/sound/cm/t/savant/hlp-02.wav differ diff --git a/mpq/sound/cm/t/savant/hlp-03.wav b/mpq/sound/cm/t/savant/hlp-03.wav new file mode 100644 index 00000000..daa77c1d Binary files /dev/null and b/mpq/sound/cm/t/savant/hlp-03.wav differ diff --git a/mpq/sound/cm/t/savant/hlp-04.wav b/mpq/sound/cm/t/savant/hlp-04.wav new file mode 100644 index 00000000..7544c76a Binary files /dev/null and b/mpq/sound/cm/t/savant/hlp-04.wav differ diff --git a/mpq/sound/cm/t/savant/rdy-01.wav b/mpq/sound/cm/t/savant/rdy-01.wav new file mode 100644 index 00000000..f98ea3e1 Binary files /dev/null and b/mpq/sound/cm/t/savant/rdy-01.wav differ diff --git a/mpq/sound/cm/t/savant/rdy-02.wav b/mpq/sound/cm/t/savant/rdy-02.wav new file mode 100644 index 00000000..a03019e4 Binary files /dev/null and b/mpq/sound/cm/t/savant/rdy-02.wav differ diff --git a/mpq/sound/cm/t/savant/rdy-03.wav b/mpq/sound/cm/t/savant/rdy-03.wav new file mode 100644 index 00000000..0bc1b4fa Binary files /dev/null and b/mpq/sound/cm/t/savant/rdy-03.wav differ diff --git a/mpq/sound/cm/t/savant/ready-01.wav b/mpq/sound/cm/t/savant/ready-01.wav deleted file mode 100644 index 4f6b5eb7..00000000 Binary files a/mpq/sound/cm/t/savant/ready-01.wav and /dev/null differ diff --git a/mpq/sound/cm/t/savant/toggle-a-01.wav b/mpq/sound/cm/t/savant/toggle-a-01.wav index 500b5a09..4fdc7e38 100644 Binary files a/mpq/sound/cm/t/savant/toggle-a-01.wav and b/mpq/sound/cm/t/savant/toggle-a-01.wav differ diff --git a/mpq/sound/cm/t/savant/toggle-a-02.wav b/mpq/sound/cm/t/savant/toggle-a-02.wav index c0cd64a4..e9b0eff5 100644 Binary files a/mpq/sound/cm/t/savant/toggle-a-02.wav and b/mpq/sound/cm/t/savant/toggle-a-02.wav differ diff --git a/mpq/sound/cm/t/savant/toggle-a-03.wav b/mpq/sound/cm/t/savant/toggle-a-03.wav index 55609ca8..be716f6f 100644 Binary files a/mpq/sound/cm/t/savant/toggle-a-03.wav and b/mpq/sound/cm/t/savant/toggle-a-03.wav differ diff --git a/mpq/sound/cm/t/savant/toggle-b-01.wav b/mpq/sound/cm/t/savant/toggle-b-01.wav index e6c6289c..2331dbe6 100644 Binary files a/mpq/sound/cm/t/savant/toggle-b-01.wav and b/mpq/sound/cm/t/savant/toggle-b-01.wav differ diff --git a/mpq/sound/cm/t/savant/toggle-b-02.wav b/mpq/sound/cm/t/savant/toggle-b-02.wav index 7561bc9a..e9a19ded 100644 Binary files a/mpq/sound/cm/t/savant/toggle-b-02.wav and b/mpq/sound/cm/t/savant/toggle-b-02.wav differ diff --git a/mpq/sound/cm/t/savant/toggle-b-03.wav b/mpq/sound/cm/t/savant/toggle-b-03.wav index 7682e9d9..4265c4fc 100644 Binary files a/mpq/sound/cm/t/savant/toggle-b-03.wav and b/mpq/sound/cm/t/savant/toggle-b-03.wav differ diff --git a/mpq/sound/cm/t/savant/wht-01.wav b/mpq/sound/cm/t/savant/wht-01.wav new file mode 100644 index 00000000..9fc8cabf Binary files /dev/null and b/mpq/sound/cm/t/savant/wht-01.wav differ diff --git a/mpq/sound/cm/t/savant/wht-02.wav b/mpq/sound/cm/t/savant/wht-02.wav new file mode 100644 index 00000000..63566c70 Binary files /dev/null and b/mpq/sound/cm/t/savant/wht-02.wav differ diff --git a/mpq/sound/cm/t/savant/wht-03.wav b/mpq/sound/cm/t/savant/wht-03.wav new file mode 100644 index 00000000..f3bf6150 Binary files /dev/null and b/mpq/sound/cm/t/savant/wht-03.wav differ diff --git a/mpq/sound/cm/t/savant/wht-04.wav b/mpq/sound/cm/t/savant/wht-04.wav new file mode 100644 index 00000000..42eb2192 Binary files /dev/null and b/mpq/sound/cm/t/savant/wht-04.wav differ diff --git a/mpq/sound/cm/t/savant/yes-01.wav b/mpq/sound/cm/t/savant/yes-01.wav index 7ffc6c8f..15bdadeb 100644 Binary files a/mpq/sound/cm/t/savant/yes-01.wav and b/mpq/sound/cm/t/savant/yes-01.wav differ diff --git a/mpq/sound/cm/t/savant/yes-02.wav b/mpq/sound/cm/t/savant/yes-02.wav index ec30d3cf..d64a766e 100644 Binary files a/mpq/sound/cm/t/savant/yes-02.wav and b/mpq/sound/cm/t/savant/yes-02.wav differ diff --git a/mpq/sound/cm/t/savant/yes-03.wav b/mpq/sound/cm/t/savant/yes-03.wav index a8219034..f35db9b7 100644 Binary files a/mpq/sound/cm/t/savant/yes-03.wav and b/mpq/sound/cm/t/savant/yes-03.wav differ diff --git a/mpq/sound/cm/t/savant/yes-04.wav b/mpq/sound/cm/t/savant/yes-04.wav index 4c7c670a..0b87dc31 100644 Binary files a/mpq/sound/cm/t/savant/yes-04.wav and b/mpq/sound/cm/t/savant/yes-04.wav differ diff --git a/mpq/sound/cm/t/siren/agg-01.wav b/mpq/sound/cm/t/siren/agg-01.wav new file mode 100644 index 00000000..ce70d54c Binary files /dev/null and b/mpq/sound/cm/t/siren/agg-01.wav differ diff --git a/mpq/sound/cm/t/siren/agg-02.wav b/mpq/sound/cm/t/siren/agg-02.wav new file mode 100644 index 00000000..0e30f21f Binary files /dev/null and b/mpq/sound/cm/t/siren/agg-02.wav differ diff --git a/mpq/sound/cm/t/siren/agg-03.wav b/mpq/sound/cm/t/siren/agg-03.wav new file mode 100644 index 00000000..f819e389 Binary files /dev/null and b/mpq/sound/cm/t/siren/agg-03.wav differ diff --git a/mpq/sound/cm/t/siren/agg-04.wav b/mpq/sound/cm/t/siren/agg-04.wav new file mode 100644 index 00000000..bc4c6270 Binary files /dev/null and b/mpq/sound/cm/t/siren/agg-04.wav differ diff --git a/mpq/sound/cm/t/siren/hlp-01.wav b/mpq/sound/cm/t/siren/hlp-01.wav new file mode 100644 index 00000000..4f9dd1cb Binary files /dev/null and b/mpq/sound/cm/t/siren/hlp-01.wav differ diff --git a/mpq/sound/cm/t/siren/hlp-02.wav b/mpq/sound/cm/t/siren/hlp-02.wav new file mode 100644 index 00000000..e13c9566 Binary files /dev/null and b/mpq/sound/cm/t/siren/hlp-02.wav differ diff --git a/mpq/sound/cm/t/siren/hlp-03.wav b/mpq/sound/cm/t/siren/hlp-03.wav new file mode 100644 index 00000000..992de921 Binary files /dev/null and b/mpq/sound/cm/t/siren/hlp-03.wav differ diff --git a/mpq/sound/cm/t/siren/hlp-04.wav b/mpq/sound/cm/t/siren/hlp-04.wav new file mode 100644 index 00000000..e5d37c8d Binary files /dev/null and b/mpq/sound/cm/t/siren/hlp-04.wav differ diff --git a/mpq/sound/cm/t/siren/rdy-01.wav b/mpq/sound/cm/t/siren/rdy-01.wav index 906b8e26..76f28663 100644 Binary files a/mpq/sound/cm/t/siren/rdy-01.wav and b/mpq/sound/cm/t/siren/rdy-01.wav differ diff --git a/mpq/sound/cm/t/siren/rdy-02.wav b/mpq/sound/cm/t/siren/rdy-02.wav new file mode 100644 index 00000000..adf63c53 Binary files /dev/null and b/mpq/sound/cm/t/siren/rdy-02.wav differ diff --git a/mpq/sound/cm/t/siren/rdy-03.wav b/mpq/sound/cm/t/siren/rdy-03.wav new file mode 100644 index 00000000..421a5fc7 Binary files /dev/null and b/mpq/sound/cm/t/siren/rdy-03.wav differ diff --git a/mpq/sound/cm/t/siren/wht-01.wav b/mpq/sound/cm/t/siren/wht-01.wav index f886a016..8d2007e4 100644 Binary files a/mpq/sound/cm/t/siren/wht-01.wav and b/mpq/sound/cm/t/siren/wht-01.wav differ diff --git a/mpq/sound/cm/t/siren/wht-02.wav b/mpq/sound/cm/t/siren/wht-02.wav index 116abf06..279ba708 100644 Binary files a/mpq/sound/cm/t/siren/wht-02.wav and b/mpq/sound/cm/t/siren/wht-02.wav differ diff --git a/mpq/sound/cm/t/siren/wht-03.wav b/mpq/sound/cm/t/siren/wht-03.wav index 8858f8e8..72605ecc 100644 Binary files a/mpq/sound/cm/t/siren/wht-03.wav and b/mpq/sound/cm/t/siren/wht-03.wav differ diff --git a/mpq/sound/cm/t/siren/wht-04.wav b/mpq/sound/cm/t/siren/wht-04.wav index 3ec574fb..f64c8bf9 100644 Binary files a/mpq/sound/cm/t/siren/wht-04.wav and b/mpq/sound/cm/t/siren/wht-04.wav differ diff --git a/mpq/sound/cm/t/siren/yes-01.wav b/mpq/sound/cm/t/siren/yes-01.wav index c56ac734..e9660701 100644 Binary files a/mpq/sound/cm/t/siren/yes-01.wav and b/mpq/sound/cm/t/siren/yes-01.wav differ diff --git a/mpq/sound/cm/t/siren/yes-02.wav b/mpq/sound/cm/t/siren/yes-02.wav index 7eb824ca..50d8e584 100644 Binary files a/mpq/sound/cm/t/siren/yes-02.wav and b/mpq/sound/cm/t/siren/yes-02.wav differ diff --git a/mpq/sound/cm/t/siren/yes-03.wav b/mpq/sound/cm/t/siren/yes-03.wav index 045cd471..14827678 100644 Binary files a/mpq/sound/cm/t/siren/yes-03.wav and b/mpq/sound/cm/t/siren/yes-03.wav differ diff --git a/mpq/sound/cm/t/siren/yes-04.wav b/mpq/sound/cm/t/siren/yes-04.wav index de692629..2fdaa07d 100644 Binary files a/mpq/sound/cm/t/siren/yes-04.wav and b/mpq/sound/cm/t/siren/yes-04.wav differ diff --git a/mpq/sound/terran/battle/TBaYam01.wav b/mpq/sound/terran/battle/TBaYam01.wav deleted file mode 100644 index e9ce293b..00000000 Binary files a/mpq/sound/terran/battle/TBaYam01.wav and /dev/null differ diff --git a/mpq/tileset/platform.cv5 b/mpq/tileset/platform.cv5 index b44278b6..5f5a9073 100644 Binary files a/mpq/tileset/platform.cv5 and b/mpq/tileset/platform.cv5 differ diff --git a/mpq/tileset/platform.vf4 b/mpq/tileset/platform.vf4 index aadf437b..4bd247fe 100644 Binary files a/mpq/tileset/platform.vf4 and b/mpq/tileset/platform.vf4 differ diff --git a/mpq/tileset/platform.vr4 b/mpq/tileset/platform.vr4 index 0e4cb22d..858499d3 100644 Binary files a/mpq/tileset/platform.vr4 and b/mpq/tileset/platform.vr4 differ diff --git a/mpq/tileset/platform.vx4ex b/mpq/tileset/platform.vx4ex index 10ddad61..5736f48d 100644 Binary files a/mpq/tileset/platform.vx4ex and b/mpq/tileset/platform.vx4ex differ diff --git a/mpq/unit/cm/terran/magnetar-yamato.lol b/mpq/unit/cm/terran/magnetar-yamato.lol new file mode 100644 index 00000000..e0f9155e Binary files /dev/null and b/mpq/unit/cm/terran/magnetar-yamato.lol differ diff --git a/mpq/unit/cm/terran/matador-shadow.grp b/mpq/unit/cm/terran/matador-shadow.grp index f71d7aa2..3542e2e7 100644 Binary files a/mpq/unit/cm/terran/matador-shadow.grp and b/mpq/unit/cm/terran/matador-shadow.grp differ diff --git a/mpq/unit/cm/terran/matador.grp b/mpq/unit/cm/terran/matador.grp index 9d135e63..8da7d4b7 100644 Binary files a/mpq/unit/cm/terran/matador.grp and b/mpq/unit/cm/terran/matador.grp differ diff --git a/mpq/unit/cm/terran/phobos-yamato.lol b/mpq/unit/cm/terran/phobos-yamato.lol deleted file mode 100644 index d59934ec..00000000 Binary files a/mpq/unit/cm/terran/phobos-yamato.lol and /dev/null differ diff --git a/mpq/unit/cm/terran/savant.grp b/mpq/unit/cm/terran/savant.grp index ba37d637..c6a9ece6 100644 Binary files a/mpq/unit/cm/terran/savant.grp and b/mpq/unit/cm/terran/savant.grp differ diff --git a/patchnotes.md b/patchnotes.md index fc7f9a9c..ee94c500 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -92,7 +92,7 @@ Just like every other large-scale change we have attempted recently, this will b - Weapon cooldown now 0.833, from 0.75 - Entropy Gauntlets: - Now always drains 10 energy per attack - - Weapon now benefits from Prolonged Arms while active + - Weapon now benefits from Kinetic Penetration while active - No longer increases damage - Power Siphon: - Now steals 5% attack speed per stack from victims, expiring after 2 seconds of not being refreshed @@ -136,7 +136,7 @@ Just like every other large-scale change we have attempted recently, this will b - Weapon range now 6, from 7 - Titan's Fist: - Armor penetration now 5, from 15 - - Weapon cooldown now 0.75. from 0.666 + - Weapon cooldown now 0.75, from 0.666 - Dishonorable Discharge: - Now grants +3 armor penetration to turned targets - No longer grants bonus damage @@ -145,7 +145,7 @@ Just like every other large-scale change we have attempted recently, this will b - Weapon damage now 15, from 20 - Armor penetration now 0, from 3 - Weapon cooldown now 1, from 0.625 - - Weapon now benefits from Prolonged Arms and goes to maximum range + - Weapon now benefits from Kinetic Penetration and goes to maximum range - [Dilettante](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/dilettante): - Mineral and gas costs now 125/25, from 75/50 - HP now 90, from 80 @@ -219,7 +219,7 @@ Just like every other large-scale change we have attempted recently, this will b - Armor now 1, from 2 - Armor penetration now 2, from 4 - Weapon cooldown now 0.916, from 0.833 - - Weapon now benefits from Prolonged Arms and goes to maximum range + - Weapon now benefits from Kinetic Penetration and goes to maximum range - Weapon no longer splashes - [Durendal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/durendal): - HP now 200, from 180 @@ -257,7 +257,8 @@ Just like every other large-scale change we have attempted recently, this will b - HP now 500, from 400 - Armor now 5, from 7 - Weapon outer splash now 3, from 4 - - Can now pass through + - **New ability:** Phantasmal Passage: + - No longer collides with small units and structures - [Anticthon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anticthon): - No longer low-flight - Armor now 3, from 5 @@ -306,12 +307,52 @@ Just like every other large-scale change we have attempted recently, this will b - HP now 250, from 225 - Armor now 2, from 4 - Now moves ~17% slower +- [Centaur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/centaur): + - HP now 450, from 325 + - Armor now 4, from 5 + - Artax Cannon: + - Weapon damage now 30, from 35 + - Armor penetration now 0, from 8 + - Weapon range now 6, from 7 + - Now deals unsafe splash + - Sunchaser Missiles: + - Weapon damage now 4x8, from 4x10 + - Armor penetration now 4, from 5 + - Weapon cooldown now 2.25, from 2.5 +- [Minotaur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/minotaur): + - HP now 500, from 400 + - Armor now 4, from 6 + - Armor penetration now 3, from 5 + - Fore Castle: + - Now grants 150% armor, instead of flat +2 +- [Magnetar](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/magnetar): + - HP now 350, from 300 + - Armor now 4, from 5 + - Now a specialist with 250 energy + - Weapon damage now 25, from 35 + - Weapon range now 8, from 9 + - Weapon now benefits from Kinetic Penetration + - **New ability:** Yamato Cannon + - Channels for ~3 seconds before firing a laser blast, dealing 250 damage in a 3-range radius; Costs 200 energy, 8 cast range +- [Hippogriff](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/hippogriff): + - Armor now 3, from 4 + - Sight range now 9, from 11 + - Now moves ~22% slower + - Weapon damage now 4x15, from 4x20 + - Armor penetration now 4, from 5 + - Weapon cooldown now 2.25, from 2 +- [Phobos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phobos): + - HP now 900, from 800 + - Armor now 6, from 8 + - Energy now 100, from 200 + - Yamato Cannon: + - Removed - [Bunker](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/bunker): - Armor now 1, from 2 - [Watchdog](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/watchdog): - Armor penetration now 0, from 2 - [Sentinel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sentinel): - - Armor penetration now 0, from 4 + - Armor penetration now 3, from 4 - [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon): - Armor now 6, from 8 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a631f7d8..300d025f 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ