diff --git a/CMBW-maps/melee/1v1/Inactive Pool/(2)Proxima.scx b/CMBW-maps/melee/1v1/Competitive Pool/Inactive/(2)Proxima.scx similarity index 100% rename from CMBW-maps/melee/1v1/Inactive Pool/(2)Proxima.scx rename to CMBW-maps/melee/1v1/Competitive Pool/Inactive/(2)Proxima.scx diff --git a/CMBW-maps/melee/1v1/Inactive Pool/(2)Terminus.scx b/CMBW-maps/melee/1v1/Competitive Pool/Inactive/(2)Terminus.scx similarity index 100% rename from CMBW-maps/melee/1v1/Inactive Pool/(2)Terminus.scx rename to CMBW-maps/melee/1v1/Competitive Pool/Inactive/(2)Terminus.scx diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Everessence.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Everessence.scx similarity index 100% rename from CMBW-maps/melee/1v1/Nonstandard/(2)Everessence.scx rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Everessence.scx diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx similarity index 100% rename from CMBW-maps/melee/1v1/Nonstandard/(2)Rest in Paradise.scx rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Sun-Starved.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Sun-Starved.scx similarity index 100% rename from CMBW-maps/melee/1v1/Nonstandard/(2)Sun-Starved.scx rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Sun-Starved.scx diff --git a/CMBW-maps/melee/1v1/Nonstandard/(4)Godhead.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Godhead.scx similarity index 100% rename from CMBW-maps/melee/1v1/Nonstandard/(4)Godhead.scx rename to CMBW-maps/melee/1v1/Nonstandard/Retired/(4)Godhead.scx diff --git a/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx b/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx index 7e09faa4..515c844c 100644 Binary files a/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx and b/CMBW-maps/melee/3v3/(6)Tectonic Kingdom.scx differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 2598642f..7957ebf7 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 13313d96..e267d7a6 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -270,7 +270,7 @@ Magister Vassal Madcap Salamander -Salamander Torpedo +Silvertongue Laser Gorgon Pegasus Phobos @@ -278,7 +278,7 @@ Penumbra Cyclops Pegasus Missile Phobos Laser -Salamander Torpedo copy +Salamander Torpedo Sanctum of Sorrow Geszkath Grotto Shaman (Support Mode) diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index e6d819a7..03e9d894 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 b78eeccd..e2464420 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2477,13 +2477,13 @@ Shaman Support 01 Protoss Advisor Error - Placement Protoss Advisor Update - Structure Treasury Selected 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Silvertongue Weaponfire 01 +Silvertongue Weaponfire 02 +Silvertongue Weaponfire 03 +Silvertongue Weaponfire 04 +Silvertongue Weaponfire 05 +Lakizilisk Weaponfire 01 +Droleth Weaponfire 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a0917c2b..0105ddeb 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2476,4 +2476,11 @@ cm\t\shaman\switch-02.wav cm\t\shaman\switch-03.wav protoss\advisor\paderr03.wav protoss\advisor\padupd03.wav -cm\t\_building\treasury.wav \ No newline at end of file +cm\t\_building\treasury.wav +cm\t\silvertongue\wf-01.wav +cm\t\silvertongue\wf-02.wav +cm\t\silvertongue\wf-03.wav +cm\t\silvertongue\wf-04.wav +cm\t\silvertongue\wf-05.wav +cm\z\lakizilisk\wf-01.wav +cm\z\droleth\wf-01.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index ef0d5e75..01af7ea2 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 b56a0690..c694b91d 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 4d6f43b5..89e53615 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -767,7 +767,7 @@ DrolethUnused1: DrolethGndAttkInit: setvertpos 0 - playsnd 64 # Bullet\SpoogHit.wav + playsnd 2485 # Droleth Weaponfire 01 sproluselo 332 0 # Needle Spines (thingy\spooge.grp) wait 1 attackwith 1 @@ -5901,6 +5901,7 @@ Goliath_Turret_Walking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 237 Sarah Kerrigan (terran\ughost.grp) +# 1615 Silvertongue (cm\terran\silvertongue.grp) .headerstart IsId 77 Type 13 @@ -5998,7 +5999,7 @@ SarahKerriganLocal02: SarahKerriganDeath: playsnd 470 # Terran\KERRIGAN\UKeDth00.wav imgol 231 0 0 # Eidolon Death (terran\ghost.grp) - wait 1 + wait 1 end SarahKerriganGndAttkInit: @@ -6010,7 +6011,7 @@ SarahKerriganGndAttkInit: SarahKerriganGndAttkRpt: wait 1 nobrkcodestart - playsnd 98 # Bullet\TGhFir00.wav + playsndbtwn 2479 2483 # Silvertongue weaponfire 01 ... 05 attack playfram 0xcc wait 1 @@ -20681,7 +20682,7 @@ LakiziliskGndAttkInit: nobrkcodestart LakiziliskGndAttkRpt: wait 1 - playsnd 64 # Bullet\SpoogHit.wav + playsnd 2484 # Lakizilisk weaponfire 01 sigorder 32 attack wait 1 diff --git a/mpq/sound/cm/t/silvertongue/wf-01.wav b/mpq/sound/cm/t/silvertongue/wf-01.wav new file mode 100644 index 00000000..5a6ab3c6 Binary files /dev/null and b/mpq/sound/cm/t/silvertongue/wf-01.wav differ diff --git a/mpq/sound/cm/t/silvertongue/wf-02.wav b/mpq/sound/cm/t/silvertongue/wf-02.wav new file mode 100644 index 00000000..674a54df Binary files /dev/null and b/mpq/sound/cm/t/silvertongue/wf-02.wav differ diff --git a/mpq/sound/cm/t/silvertongue/wf-03.wav b/mpq/sound/cm/t/silvertongue/wf-03.wav new file mode 100644 index 00000000..2a5144b3 Binary files /dev/null and b/mpq/sound/cm/t/silvertongue/wf-03.wav differ diff --git a/mpq/sound/cm/t/silvertongue/wf-04.wav b/mpq/sound/cm/t/silvertongue/wf-04.wav new file mode 100644 index 00000000..efd5d8b7 Binary files /dev/null and b/mpq/sound/cm/t/silvertongue/wf-04.wav differ diff --git a/mpq/sound/cm/t/silvertongue/wf-05.wav b/mpq/sound/cm/t/silvertongue/wf-05.wav new file mode 100644 index 00000000..9ceb4586 Binary files /dev/null and b/mpq/sound/cm/t/silvertongue/wf-05.wav differ diff --git a/mpq/sound/cm/z/droleth/wf-01.wav b/mpq/sound/cm/z/droleth/wf-01.wav new file mode 100644 index 00000000..1fb65957 Binary files /dev/null and b/mpq/sound/cm/z/droleth/wf-01.wav differ diff --git a/mpq/sound/cm/z/lakizilisk/wf-01.wav b/mpq/sound/cm/z/lakizilisk/wf-01.wav new file mode 100644 index 00000000..eb02519d Binary files /dev/null and b/mpq/sound/cm/z/lakizilisk/wf-01.wav differ diff --git a/mpq/unit/cm/zerg/liiralisk-birth.grp b/mpq/unit/cm/zerg/liiralisk-birth.grp index 2c4decad..6ced5939 100644 Binary files a/mpq/unit/cm/zerg/liiralisk-birth.grp and b/mpq/unit/cm/zerg/liiralisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-attack.grp b/mpq/unit/cm/zerg/quazilisk-attack.grp index 91c77670..63ffe75c 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-attack.grp and b/mpq/unit/cm/zerg/quazilisk-attack.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-birth.grp b/mpq/unit/cm/zerg/quazilisk-birth.grp index 469b82ec..09a7f18c 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-birth.grp and b/mpq/unit/cm/zerg/quazilisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-mutate.grp b/mpq/unit/cm/zerg/quazilisk-mutate.grp index 144fbb75..810be7c6 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-mutate.grp and b/mpq/unit/cm/zerg/quazilisk-mutate.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-remains.grp b/mpq/unit/cm/zerg/quazilisk-remains.grp index e6b672ea..7e13bd6c 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-remains.grp and b/mpq/unit/cm/zerg/quazilisk-remains.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-shadow.grp b/mpq/unit/cm/zerg/quazilisk-shadow.grp index 4d801ee9..c6b92b92 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-shadow.grp and b/mpq/unit/cm/zerg/quazilisk-shadow.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk.grp b/mpq/unit/cm/zerg/quazilisk.grp index 2be0fd97..150dba67 100644 Binary files a/mpq/unit/cm/zerg/quazilisk.grp and b/mpq/unit/cm/zerg/quazilisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index cbd88515..820d2e57 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 5f006e2f..7c7afc90 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index 26cdec53..20767689 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -14,14 +14,19 @@ TBD - This is **not** 100% consistent with weapon ranges; we will improve this feature in time! ## Audiovisuals: -- New sprite for: +- New sprite: - Liiralisk (c. Solstice) -- Updated icon for: +- Updated sprite: + - Quazilisk (c. Solstice) +- Updated icon: - Diadem +- New weaponfire SFX: + - Silvertongue ## Bugfixes - Stability: - Fixed another nullsprite crash (r. Alexhandr) + - Scenarios: Fixed a trigger-related crash when removing units (r. StratosTygo) - Gameplay: - Structures can no longer spawn trained units on different height levels based on rally point (c. Veeq7) - Attacks with the "go to max range" behavior now calculate max ranges more accurately (c. Veeq7) @@ -35,6 +40,7 @@ TBD - Aura circles no longer show for selected enemy units (replay/witness mode notwithstanding) - Fixed Gosvileths not getting the correct shadow offset when cancelling or interrupting constructions (r. Mystery Meat) - Fixed error printout related to Sevenstep's passive + - Corrected Silvertongue portrait ## Terran - [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops): @@ -46,6 +52,9 @@ TBD - Fragmentary Shells removed - **New: Recursion Rounds:** - Each Cyclops attack leaves behind a latent shell that detonates after 2 seconds, dealing 10 damage to all enemies within 2 range +- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): + - HP now 160, from 180 + - Armor now 3, from 2 - [Quarry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/quarry): - Collision size adjusted to make right-side resource returns more elegant - [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury): @@ -53,7 +62,7 @@ TBD ## Protoss - [Hierophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/hierophant): - - Attack windup now 3 frames long, from 6, increasing responsivity + - Initial attack windup now 3 frames long, from 6, increasing responsivity ## Zerg - [Quazilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/quazilisk): @@ -62,4 +71,11 @@ TBD - [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): - Attack windup now 2 frames long, from 4, increasing responsivity - [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor): - - Armor now 1, from 2 \ No newline at end of file + - Armor now 1, from 2 +- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk): + - HP now 180, from 200 + - Weapon cooldown now 2, from 1.875 +- [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor): + - Armor penetration now 0, from 1 + - Weapon cooldown now 0.5, from 0.42 + - Weapon splash radii now 20/30/40, from 30/37/45 (pixels) \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 80e8aaaf..f6e56c58 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ