diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index a8bc7ab8..51a1a996 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 0e89270b..6ccc3a25 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -159,7 +159,7 @@ Psionic Storm Yamato Gun Phase Disruptor STA/STS Cannon Overlay -Sunken Colony Tentacle +Surkith Cesiant Tentacle Venom Acid Spore Plasma Drip Hit (Unused) @@ -494,7 +494,7 @@ Omnivale Lodestone Ocsal Cesiant Potentate -Extended Flingy #288 +Skortrith Cesiant Tentacle Extended Flingy #289 Extended Flingy #290 Extended Flingy #291 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 6a0f5569..51bf2e30 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 6c6f2144..49f285b4 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -504,7 +504,7 @@ Building Lifting Dust Type4 White Circle Needle Spine Hit Plasma Drip Hit (Unused) -Sunken Colony Tentacle +Surkith Cesiant Tentacle Venom Venom Hit (Unused) Acid Spore @@ -1701,8 +1701,8 @@ Spirtith Colony Spirtith Colony Shadow Diadem Attack A3 Diadem Attack A4 -Skortrith Colony -Skortrith Colony Shadow +Skortrith Cesiant +Skortrith Cesiant Shadow Anchor Attack Overlay (Green) Anchor Attack Overlay (Blue) Terran Unit Rubble (Medium) @@ -1764,7 +1764,7 @@ Ocsal Cesiant Ocsal Cesiant Shadow Potentate Potentate Shadow -Extended Image #764 +Skortrith Cesiant Tentacle Extended Image #765 Extended Image #766 Extended Image #767 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index fa2c87a0..94756851 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 2534dbfd..aaea61b5 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2538,13 +2538,13 @@ Protathalor Weaponfire 01 Protathalor Weaponfire 02 Protathalor Weaponfire 03 Bactalisk Death 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Skortrith Weaponfire 01 +Skortrith Weaponhit 01 +Spirtith Weaponfire 01 +Spirtith Weaponfire 02 +Spirtith Weaponfire 03 +Spirtith Weaponhit 01 +Spirtith Weaponhit 02 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a6f05525..b921bd91 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2537,4 +2537,11 @@ cm\z\tosgrilisk\wf-02.wav cm\z\protathalor\wf-01.wav cm\z\protathalor\wf-02.wav cm\z\protathalor\wf-03.wav -cm\z\bactalisk\dth-01.wav \ No newline at end of file +cm\z\bactalisk\dth-01.wav +cm\z\skortrith\wf-01.wav +cm\z\skortrith\wh-01.wav +cm\z\spirtith\wf-01.wav +cm\z\spirtith\wf-02.wav +cm\z\spirtith\wf-03.wav +cm\z\spirtith\wh-01.wav +cm\z\spirtith\wh-02.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 6cb30481..d7b91f4c 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 ad447ce7..f9374305 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -353,7 +353,7 @@ Yamato Gun Trail EMP Shockwave Missile Needle Spine Hit Plasma Drip Hit (Unused) -Sunken Colony Tentacle +Surkith Colony Tentacle Venom Acid Spore Glave Wurm @@ -882,7 +882,7 @@ Omnivale Lodestone Ocsal Cesiant Potentate -Extended Sprite #1 +Skortrith Cesiant Tentacle Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index e32c6595..16a746a8 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 8f959e59..99747eef 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -31180,7 +31180,7 @@ BactaliskLocal00: goto BactaliskLocal00 BactaliskLocal01: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 1 playfram 0xcc wait 1 @@ -31218,7 +31218,7 @@ BactaliskLocal02: goto BactaliskWalkingToIdle BactaliskDeath: - playsnd 867 # Zerg\Hydra\ZHyDth00.WAV + playsnd 2539 # Bactalisk death 01 setfldirect 0 playfram 561 wait 2 @@ -31264,7 +31264,7 @@ BactaliskUnused1: goto BactaliskWalkingToIdle BactaliskGndAttkInit: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 1 nobrkcodestart playfram 0xcc @@ -33994,9 +33994,7 @@ SeekerSporesSilentDeathGen: goto SeekerSporesSilentDeath SeekerSporesSilentDeathSpraith: - playsndbtwn 1194 1195 - goto SeekerSporesSilentDeath - + playsndbtwn 1194 1195 # Spraith Cesiant weaponhit 01, 02 SeekerSporesSilentDeath: sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg @@ -39558,17 +39556,28 @@ SeekerSporesBounceDeath: sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg if bullet.weapon_id == 163 goto ProtathalorSporesBounceDeath + if bullet.weapon_id == 178 goto SpirtithSporesBounceDeath playsnd 79 # Bullet\ZLuHit00.wav - wait 1 - end + goto SeekerSporesBounceDeath2 ProtathalorSporesBounceDeath: playsndbtwn 2399 2402 # Protathalor weaponhit 01, 02, 03, 04 - wait 1 + goto SeekerSporesBounceDeath2 + +SpirtithSporesBounceDeath: + playsndbtwn 2545 2546 # Spirtith Cesiant weaponhit 01, 02 +SeekerSporesBounceDeath2: + wait 1 end SeekerSporesBounceSpecialState1: + if bullet.weapon_id == 178 goto SeekerSporesBounceSpecialState1Spirtith playsnd 79 # Bullet\ZLuHit00.wav + goto SeekerSporesBounceSpecialState1Fin + +SeekerSporesBounceSpecialState1Spirtith: + playsndbtwn 2545 2546 # Spirtith Cesiant weaponhit 01, 02 +SeekerSporesBounceSpecialState1Fin: sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) domissiledmg goto SeekerSporesBounceGndAttkInit @@ -50263,7 +50272,7 @@ SpirtithCesiantAirAttkInit: wait 1 playfram 5 attackwith 2 - playsndbtwn 2155 2157 # Spirtith Cesiant weaponfire 01, 02, 03 + playsndbtwn 2542 2544 # Spirtith Cesiant weaponfire 01, 02, 03 wait 2 playfram 6 wait 1 @@ -51681,58 +51690,6 @@ Init SpiderMineExplosionDeath Death ScourgeExplosionDeath .headerend -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1745 Philoc (cm\faction\philoc.grp) -.headerstart -IsId 751 -Type 12 -Init PhilocInit -Death PhilocDeath -GndAttkInit PhilocGndAttkInit -AirAttkInit PhilocGndAttkInit -Unused1 [NONE] -GndAttkRpt PhilocGndAttkInit -AirAttkRpt PhilocGndAttkInit -CastSpell [NONE] -GndAttkToIdle WraithGndAttkToIdle -AirAttkToIdle WraithGndAttkToIdle -Unused2 [NONE] -Walking PhilocWalking -WalkingToIdle WraithGndAttkToIdle -SpecialState1 [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -PhilocInit: - imgulnextid 0 42 # Philoc Shadow (terran\philoc.grp) - playfram 0x00 - goto WraithGndAttkToIdle - -PhilocDeath: - playsnd 257 # Terran\PHOENIX\TPhDth00.WAV - imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) - wait 3 - lowsprul 844 0 42 # Terran Unit Rubble Medium - end - -PhilocGndAttkInit: - nobrkcodestart - wait 1 - playfram 0x20 - attackwith 1 - playsnd 74 # Bullet\TPhFi100.wav - wait 1 - playfram 0x00 - gotorepeatattk - nobrkcodeend - goto WraithLocal00 - -PhilocWalking: - setvertpos 0 - imgol 1747 0 0 # Philoc Engines (terran\wraith-engine.grp) - goto WraithLocal00 - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1714 Engram (cm\protoss\engram.grp) @@ -52266,4 +52223,212 @@ PotentateWarpIn: imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 -# Next free isid: 760 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 076 Surkith Cesiant (cm\zerg\skortrith-cesiant.grp) +.headerstart +IsId 760 +Type 20 +Init SkortrithCesiantInit +Death CerebrateDeath +GndAttkInit SkortrithCesiantGndAttkInit +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt SkortrithCesiantGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle SurkithCesiantGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt SurkithCesiantAlmostBuilt +Built SurkithCesiantBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking SurkithCesiantIsWorking +WorkingToIdle SurkithCesiantIsWorking +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SkortrithCesiantInit: + playfram 0x00 + imgul 1704 0 0 # Skortrith Cesiant Shadow (cm\zerg\skortrith-cesiant-shadow.grp) + goto InfestedTerranLocal00 + +SkortrithCesiantGndAttkInit: + trgtarccondjmp 74 42 SkortrithCesiantLocal00 + trgtarccondjmp 159 42 SkortrithCesiantLocal01 + nobrkcodestart + playsnd 2540 # Skortrith Cesiant weaponfire 01 + playfram 24 + wait 1 + playfram 25 + wait 1 + playfram 26 + wait 1 + playfram 27 + wait 1 + playfram 28 + wait 1 + playfram 29 + wait 1 + playfram 30 + wait 1 + playfram 31 + wait 1 + playfram 32 + wait 1 + playfram 33 + wait 1 + attackwith 1 + wait 6 + playfram 32 + wait 1 + playfram 31 + wait 1 + playfram 30 + wait 1 + playfram 29 + wait 1 + playfram 28 + wait 1 + playfram 27 + wait 1 + playfram 26 + wait 1 + playfram 25 + wait 1 + playfram 24 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto SurkithCesiantGndAttkToIdle + +SkortrithCesiantLocal00: + nobrkcodestart + playsnd 2540 # Skortrith Cesiant weaponfire 01 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + attackwith 1 + wait 6 + playfram 12 + wait 1 + playfram 11 + wait 1 + playfram 10 + wait 1 + playfram 9 + wait 1 + playfram 8 + wait 1 + playfram 7 + wait 1 + playfram 6 + wait 1 + playfram 5 + wait 1 + playfram 4 + wait 1 + playfram 3 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto SurkithCesiantIsWorking + +SkortrithCesiantLocal01: + nobrkcodestart + playsnd 2540 # Skortrith Cesiant weaponfire 01 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0x11 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + playfram 21 + wait 1 + playfram 22 + wait 1 + playfram 23 + wait 1 + attackwith 1 + wait 6 + playfram 23 + wait 1 + playfram 22 + wait 1 + playfram 21 + wait 1 + playfram 20 + wait 1 + playfram 19 + wait 1 + playfram 18 + wait 1 + playfram 0x11 + wait 1 + playfram 16 + wait 1 + playfram 15 + wait 1 + playfram 14 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto SurkithCesiantIsWorking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1766 Skortrith Cesiant Tentacle (bullet\Tentacle.grp) +.headerstart +IsId 761 +Type 2 +Init SkortrithTentacleInit +Death SubterraneanTentacleDeath +GndAttkInit SubterraneanTentacleDeath +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SkortrithTentacleInit: + playsnd 2541 # Skortrith Cesiant weaponhit 01 + wait 1 + sigorder 1 + wait 1 + goto SubterraneanTentacleDeath + +# Next free isid: 762 \ No newline at end of file diff --git a/mpq/sound/cm/z/skortrith/wf-01.wav b/mpq/sound/cm/z/skortrith/wf-01.wav new file mode 100644 index 00000000..c876f83b Binary files /dev/null and b/mpq/sound/cm/z/skortrith/wf-01.wav differ diff --git a/mpq/sound/cm/z/skortrith/wh-01.wav b/mpq/sound/cm/z/skortrith/wh-01.wav new file mode 100644 index 00000000..12a1ce5a Binary files /dev/null and b/mpq/sound/cm/z/skortrith/wh-01.wav differ diff --git a/mpq/sound/cm/z/spirtith/wf-01.wav b/mpq/sound/cm/z/spirtith/wf-01.wav new file mode 100644 index 00000000..13ca9879 Binary files /dev/null and b/mpq/sound/cm/z/spirtith/wf-01.wav differ diff --git a/mpq/sound/cm/z/spirtith/wf-02.wav b/mpq/sound/cm/z/spirtith/wf-02.wav new file mode 100644 index 00000000..508e3988 Binary files /dev/null and b/mpq/sound/cm/z/spirtith/wf-02.wav differ diff --git a/mpq/sound/cm/z/spirtith/wf-03.wav b/mpq/sound/cm/z/spirtith/wf-03.wav new file mode 100644 index 00000000..a2052e65 Binary files /dev/null and b/mpq/sound/cm/z/spirtith/wf-03.wav differ diff --git a/mpq/sound/cm/z/spirtith/wh-01.wav b/mpq/sound/cm/z/spirtith/wh-01.wav new file mode 100644 index 00000000..b1c32278 Binary files /dev/null and b/mpq/sound/cm/z/spirtith/wh-01.wav differ diff --git a/mpq/sound/cm/z/spirtith/wh-02.wav b/mpq/sound/cm/z/spirtith/wh-02.wav new file mode 100644 index 00000000..6d2ae783 Binary files /dev/null and b/mpq/sound/cm/z/spirtith/wh-02.wav differ diff --git a/patchnotes.md b/patchnotes.md index 2fa1a324..82cbd547 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -45,18 +45,19 @@ Patch goals include: - Ocsal Cesiant now has a wireframe - Kills string has been reinstated - Durendal shadow offset has been corrected + - Skortrith Cesiant now has its own shadow - "Unit's waypoint list is full" can no longer display in replays (c. DF) ## Audiovisuals - Updated sprite for: - Ocsal Cesiant (placeholder) - Updated weaponfire SFX for: - - Patriarch, Demiurge, Protathalor, Tosgrilisk, Gorgrokor (secondary), Zarcavrokor (passive) - - Magister, Epigraph (c. lolrsk8s) + - Patriarch, Demiurge, Tosgrilisk, Protathalor, Skortrith Cesiant, Spirtith Cesiant + - Magister, Epigraph, Gorgrokor (secondary), Zarcavrokor (passive) (c. lolrsk8s) - Updated weaponhit SFX for: - - Cataphract, Claymore + - Cataphract, Claymore, Skortrith Cesiant, Spirtith Cesiant - Updated death SFX for: - - All Zerg mutations during their regression case! + - Bactalisk, and all regressing Zerg units! ## Terran - [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos):