diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 2d11a1b2..94b1e52a 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -498,7 +498,7 @@ Skortrith Cesiant Tentacle Cyclops Weapon Impact Sentinel Rail Hotshot -Nathrok Lake +Vornath Pond Skithrok Scab Qilin Auriel diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 9023ed1d..11754162 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 604e972e..744d8b73 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 005635d7..e5b1ef45 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1778,7 +1778,7 @@ Hotshot Hotshot Shadow Ocsal Regression Overlay Tyranny Overlay -Nathrok Lake +Vornath Pond Mortothrokor Birth Skibact Scab Mortothrokor Passive Overlay @@ -2421,7 +2421,7 @@ Bloodsummon Unit Rubble Tiny Bloodsummon Unit Rubble Small Bloodsummon Unit Rubble Medium Bloodsummon Ritual -Extended Image #1421 +Vornath Pond Shadow Extended Image #1422 Extended Image #1423 Extended Image #1424 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index b92cdb51..4b01d5c5 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 db5e2037..60eb9782 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4271,26 +4271,26 @@ Bloodsummon Load 01 Bloodsummon Unload 01 Grimoire Selected 01 Grimoire Passive 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Vicar Ready 01 +Vicar Ready 02 +Vicar Ready 03 +Vicar Selected 01 +Vicar Selected 02 +Vicar Selected 03 +Vicar Selected 04 +Vicar Order Passive 01 +Vicar Order Passive 02 +Vicar Order Passive 03 +Vicar Order Passive 04 +Vicar Order Aggressive 01 +Vicar Order Aggressive 02 +Vicar Order Aggressive 03 +Vicar Order Aggressive 04 +Vicar Under Attack 01 +Vicar Under Attack 02 +Vicar Under Attack 03 +Vicar Under Attack 04 +Vicar Ability Use 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index e98e5322..f23cdfe2 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4270,4 +4270,24 @@ cm\f-z\rozirokor\wh-03.wav cm\b\b-load-01.wav cm\b\b-unload-01.wav cm\b\grimoire\wht-01.wav -cm\b\grimoire\pas-proc-01.wav \ No newline at end of file +cm\b\grimoire\pas-proc-01.wav +cm\a\vicar\rdy-01.wav +cm\a\vicar\rdy-02.wav +cm\a\vicar\rdy-03.wav +cm\a\vicar\wht-01.wav +cm\a\vicar\wht-02.wav +cm\a\vicar\wht-03.wav +cm\a\vicar\wht-04.wav +cm\a\vicar\yes-01.wav +cm\a\vicar\yes-02.wav +cm\a\vicar\yes-03.wav +cm\a\vicar\yes-04.wav +cm\a\vicar\agg-01.wav +cm\a\vicar\agg-02.wav +cm\a\vicar\agg-03.wav +cm\a\vicar\agg-04.wav +cm\a\vicar\hlp-01.wav +cm\a\vicar\hlp-02.wav +cm\a\vicar\hlp-03.wav +cm\a\vicar\hlp-04.wav +cm\a\vicar\cst-01.wav \ No newline at end of file diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index 8644561f..2d09a433 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -887,7 +887,7 @@ Cyclops Weapon Impact Sentinel Rail Lanifect Remains Hotshot -Nathrok Lake +Vornath Pond Skithrok Scab Qilin Auriel diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 41e74468..97bc7723 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index f7e4aba8..c8cfcffd 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 0cf6cc51..2f6288af 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 6adc23dc..3fe7485e 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -18614,4 +18614,175 @@ ZytrylethAlmostBuilt: ZytrylethBuilt: playfram 0x00 wait 2 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1780 Vornath Pond (cm\zerg\vornath-pond.grp) +.headerstart +IsId 842 +Type 20 +Init VornathPondInit +Death VornathPondDeath +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 VornathPondAlmostBuilt +Built VornathPondBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking VornathPondIsWorking +WorkingToIdle VornathPondWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +VornathPondInit: + playfram 0x00 + imgul 2423 0 0 # Vornath Pond Shadow (cm\zerg\vornath-pond-shadow.grp) + goto VornathPondWorkingToIdle + +VornathPondWorkingToIdle: + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + goto VornathPondWorkingToIdle + +VornathPondDeath: + 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 + +VornathPondAlmostBuilt: + imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) + playfram 0x00 + goto VornathPondBuilt + +VornathPondBuilt: + playfram 0x00 + wait 2 + goto VornathPondWorkingToIdle + +VornathPondIsWorking: + playfram 4 + wait 2 + playfram 5 + wait 3 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 3 + playfram 5 + wait 2 + playfram 6 + waitrand 2 3 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + waitrand 2 4 + goto VornathPondIsWorking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1811 Chokral Chaszal +.headerstart +IsId 843 +Type 20 +Init ChokralChaszalInit +Death ChokralChaszalDeath +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 ChokralChaszalAlmostBuilt +Built ChokralChaszalBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking ChokralChaszalIsWorking +WorkingToIdle ChokralChaszalWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ChokralChaszalInit: + imgulnextid 0 0 # Chokral Chaszal Shadow + playfram 0x00 + goto ChokralChaszalWorkingToIdle + +ChokralChaszalWorkingToIdle: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + playfram 0x00 + wait 2 + goto ChokralChaszalWorkingToIdle + +ChokralChaszalDeath: + 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 + +ChokralChaszalAlmostBuilt: + imgol 107 0 0 # Zerg Building Spawn (Small) (zerg\zSpawn01.grp) +ChokralChaszalBuilt: + playfram 0x00 + wait 2 + goto ChokralChaszalWorkingToIdle + +ChokralChaszalIsWorking: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + goto ChokralChaszalIsWorking \ No newline at end of file diff --git a/mpq/sound/cm/a/vicar/agg-01.wav b/mpq/sound/cm/a/vicar/agg-01.wav new file mode 100644 index 00000000..b0437cc9 Binary files /dev/null and b/mpq/sound/cm/a/vicar/agg-01.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-02.wav b/mpq/sound/cm/a/vicar/agg-02.wav new file mode 100644 index 00000000..15759d14 Binary files /dev/null and b/mpq/sound/cm/a/vicar/agg-02.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-03.wav b/mpq/sound/cm/a/vicar/agg-03.wav new file mode 100644 index 00000000..b006b10d Binary files /dev/null and b/mpq/sound/cm/a/vicar/agg-03.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-04.wav b/mpq/sound/cm/a/vicar/agg-04.wav new file mode 100644 index 00000000..f4f8b8c5 Binary files /dev/null and b/mpq/sound/cm/a/vicar/agg-04.wav differ diff --git a/mpq/sound/cm/a/vicar/cst-01.wav b/mpq/sound/cm/a/vicar/cst-01.wav new file mode 100644 index 00000000..086277de Binary files /dev/null and b/mpq/sound/cm/a/vicar/cst-01.wav differ diff --git a/mpq/sound/cm/a/vicar/hlp-01.wav b/mpq/sound/cm/a/vicar/hlp-01.wav new file mode 100644 index 00000000..cddf8c37 Binary files /dev/null and b/mpq/sound/cm/a/vicar/hlp-01.wav differ diff --git a/mpq/sound/cm/a/vicar/hlp-02.wav b/mpq/sound/cm/a/vicar/hlp-02.wav new file mode 100644 index 00000000..b2946f54 Binary files /dev/null and b/mpq/sound/cm/a/vicar/hlp-02.wav differ diff --git a/mpq/sound/cm/a/vicar/hlp-03.wav b/mpq/sound/cm/a/vicar/hlp-03.wav new file mode 100644 index 00000000..f05fbb7c Binary files /dev/null and b/mpq/sound/cm/a/vicar/hlp-03.wav differ diff --git a/mpq/sound/cm/a/vicar/hlp-04.wav b/mpq/sound/cm/a/vicar/hlp-04.wav new file mode 100644 index 00000000..3c3c4545 Binary files /dev/null and b/mpq/sound/cm/a/vicar/hlp-04.wav differ diff --git a/mpq/sound/cm/a/vicar/rdy-01.wav b/mpq/sound/cm/a/vicar/rdy-01.wav new file mode 100644 index 00000000..72edae36 Binary files /dev/null and b/mpq/sound/cm/a/vicar/rdy-01.wav differ diff --git a/mpq/sound/cm/a/vicar/rdy-02.wav b/mpq/sound/cm/a/vicar/rdy-02.wav new file mode 100644 index 00000000..0b769f77 Binary files /dev/null and b/mpq/sound/cm/a/vicar/rdy-02.wav differ diff --git a/mpq/sound/cm/a/vicar/rdy-03.wav b/mpq/sound/cm/a/vicar/rdy-03.wav new file mode 100644 index 00000000..3d761151 Binary files /dev/null and b/mpq/sound/cm/a/vicar/rdy-03.wav differ diff --git a/mpq/sound/cm/a/vicar/wht-01.wav b/mpq/sound/cm/a/vicar/wht-01.wav new file mode 100644 index 00000000..655bc366 Binary files /dev/null and b/mpq/sound/cm/a/vicar/wht-01.wav differ diff --git a/mpq/sound/cm/a/vicar/wht-02.wav b/mpq/sound/cm/a/vicar/wht-02.wav new file mode 100644 index 00000000..15c2bb0f Binary files /dev/null and b/mpq/sound/cm/a/vicar/wht-02.wav differ diff --git a/mpq/sound/cm/a/vicar/wht-03.wav b/mpq/sound/cm/a/vicar/wht-03.wav new file mode 100644 index 00000000..a9f5db1e Binary files /dev/null and b/mpq/sound/cm/a/vicar/wht-03.wav differ diff --git a/mpq/sound/cm/a/vicar/wht-04.wav b/mpq/sound/cm/a/vicar/wht-04.wav new file mode 100644 index 00000000..81bb5fe7 Binary files /dev/null and b/mpq/sound/cm/a/vicar/wht-04.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-01.wav b/mpq/sound/cm/a/vicar/yes-01.wav new file mode 100644 index 00000000..e3f8072d Binary files /dev/null and b/mpq/sound/cm/a/vicar/yes-01.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-02.wav b/mpq/sound/cm/a/vicar/yes-02.wav new file mode 100644 index 00000000..d5dac382 Binary files /dev/null and b/mpq/sound/cm/a/vicar/yes-02.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-03.wav b/mpq/sound/cm/a/vicar/yes-03.wav new file mode 100644 index 00000000..d0124873 Binary files /dev/null and b/mpq/sound/cm/a/vicar/yes-03.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-04.wav b/mpq/sound/cm/a/vicar/yes-04.wav new file mode 100644 index 00000000..3a85ca09 Binary files /dev/null and b/mpq/sound/cm/a/vicar/yes-04.wav differ diff --git a/mpq/unit/cm/z/chokral-chaszal-shadow.grp b/mpq/unit/cm/z/chokral-chaszal-shadow.grp new file mode 100644 index 00000000..acb62eb3 Binary files /dev/null and b/mpq/unit/cm/z/chokral-chaszal-shadow.grp differ diff --git a/mpq/unit/cm/z/chokralgant-chaszal.grp b/mpq/unit/cm/z/chokral-chaszal.grp similarity index 100% rename from mpq/unit/cm/z/chokralgant-chaszal.grp rename to mpq/unit/cm/z/chokral-chaszal.grp diff --git a/mpq/unit/cm/z/vornath-pond-shadow.grp b/mpq/unit/cm/z/vornath-pond-shadow.grp new file mode 100644 index 00000000..8707a4f9 Binary files /dev/null and b/mpq/unit/cm/z/vornath-pond-shadow.grp differ diff --git a/patchnotes.md b/patchnotes.md index 652f562e..7908fe65 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -28,6 +28,7 @@ - **Skryokor**s are now appropriately treated as Broodspawn for timed life and incubation purposes (r. jakulangski) - Lardfix: Protected against rare AI breakage from niche town configurations (c. DF) - **Nydus Trinity Eidolon**s now correctly regenerate life at a higher rate when cloaked (r. jakulangski) + - **Tencendur**s can now issue load orders - **Audiovisuals:** - Fixed **Endbore** weapon name (r. Concealed Organic) - Fixed "dead pixels" in Askosi UI @@ -40,6 +41,7 @@ - Inzorthrokor (Imicren), Iziralisk (Zorthos) - New death SFX for: - Striga (c. Milia) +- Added unique shadows for **Vornath Pond**, **Chokral Chaszal** - Updated selection circle size for **Epigraph** # Balance diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 1b888f2d..9c1be0d2 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ