diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index a7f6aa4c..27026b3b 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 562e5c61..c3d07948 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -515,7 +515,7 @@ Okrimnilisk Cherbrathalor Grand Library Magister Weapon Impact -Extended Flingy #309 +Positron Projectile Extended Flingy #310 Extended Flingy #311 Extended Flingy #312 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 67d1b33d..fd2fab4a 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 f7be06b3..30906450 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 9519897a..cad8a592 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1490,9 +1490,9 @@ Infested Overlay Medium Infested Overlay Large Gas Raw Gas Raw Depleted -Worship Small -Worship Medium -Worship Large +Demiurge Worship Overlay Small +Demiurge Worship Overlay Medium +Demiurge Worship Overlay Large Controlled Demolition Emergency Detonation Madrigal Death Explosion @@ -1873,13 +1873,13 @@ Olympian Dishonorable Discharge 3 Magnetar Law of Attraction 1 Magnetar Law of Attraction 2 Magnetar Law of Attraction 3 -Extended Image #873 -Extended Image #874 -Extended Image #875 -Extended Image #876 -Extended Image #877 -Extended Image #878 -Extended Image #879 +Salamander Weaponhit +Positron Projectile +Demiurge Worship Proc Small +Demiurge Worship Proc Medium +Demiurge Worship Proc Large +Demiurge Worship Proc XLarge +Demiurge Worship Overlay XLarge Extended Image #880 Extended Image #881 Extended Image #882 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 2156a242..403aad5e 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 12d70360..4b314c3d 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3101,9 +3101,9 @@ Ataltreth Advisor Warp Complete 01 Gladius Passive Fire 01 Gladius Passive Fire 02 Gladius Passive Fire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Hierophant Banter B 01 +Hierophant Banter B 02 +Hierophant Banter B 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index f5a3535a..55732335 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 fb88838a..bb47c423 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -913,7 +913,7 @@ Olympian Dishonorable Discharge 3 Magnetar Law of Attraction 1 Magnetar Law of Attraction 2 Magnetar Law of Attraction 3 -Extended Sprite #1 +Positron Projectile Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a86ce0e7..c6f03f37 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 5a914515..8521ba9f 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 6f33e735..91c04187 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -11303,7 +11303,6 @@ ZealotWalkingToIdle: ZealotLocal00: wait 62 randcondjmp 64 ZealotLocal01 - randcondjmp 85 ZealotLocal02 goto ZealotLocal00 ZealotLocal01: @@ -11338,39 +11337,6 @@ ZealotLocal04: wait 1 goto ZealotWalkingToIdle -ZealotLocal02: - playfram 0x00 -ZealotLocal07: - playfram 0x11 - wait 1 - playfram 0x33 - wait 1 - playfram 0x44 - wait 1 - playfram 0x00 - waitrand 1 4 - randcondjmp 115 ZealotLocal07 - randcondjmp 46 ZealotLocal08 -ZealotLocal09: - playfram 0x33 - wait 1 - playfram 0x22 - wait 1 - waitrand 1 4 - randcondjmp 115 ZealotLocal07 - randcondjmp 209 ZealotLocal09 - waitrand 14 44 - playfram 0x00 - wait 1 - goto ZealotWalkingToIdle - -ZealotLocal08: - wait 1 - waitrand 14 44 - playfram 0x00 - wait 1 - goto ZealotWalkingToIdle - ZealotDeath: playsnd 678 # Protoss\ZEALOT\PZeDth00.WAV setfldirect 0 @@ -27269,7 +27235,8 @@ SalamanderMissileGndAttkInit: goto SalamanderMissileGndAttkInit SalamanderMissileDeath: - playsnd 9 # Misc\ExploSm.wav + imgol 1875 0 0 # Salamander weaponhit + playsnd 9 # Misc\ExploSm.wav domissiledmg wait 1 end @@ -40433,14 +40400,15 @@ GasRaw2Death: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1492 Worship (Small) (cm\protoss\worship-small.grp) -# 1493 Worship (Medium) (cm\protoss\worship-medium.grp) -# 1494 Worship (Large) (cm\protoss\worship-large.grp) +# 1492 Demiurge Worship Proc (Small) (cm\protoss\demiurge-worship-proc-small.grp) +# 1493 Demiurge Worship Proc (Medium) (cm\protoss\demiurge-worship-proc-medium.grp) +# 1494 Demiurge Worship Proc (Large) (cm\protoss\demiurge-worship-proc-large.grp) +# 1881 Demiurge Worship Proc (XLarge) (cm\protoss\demiurge-worship-proc-xlarge.grp) .headerstart IsId 645 Type 1 Init WorshipOverlayInit -Death WorshipOverlayDeath +Death Generic_Wait1End .headerend # ----------------------------------------------------------------------------- # @@ -40530,7 +40498,6 @@ WorshipOverlayInit: playfram 42 wait 1 playfram 43 -WorshipOverlayDeath: wait 1 end @@ -51256,6 +51223,7 @@ OlympianDishonorableDischargeInit: # 1872 Magnetar Law of Attraction 1 (cm\terran\magnetar-law-of-attraction-1.grp) # 1873 Magnetar Law of Attraction 2 (cm\terran\magnetar-law-of-attraction-2.grp) # 1874 Magnetar Law of Attraction 3 (cm\terran\magnetar-law-of-attraction-3.grp) +# 1875 Salamander Weaponhit (cm\terran\salamander-weaponhit.grp) .headerstart IsId 785 Type 1 @@ -51304,5 +51272,141 @@ MagnetarLawOfAttractionInit: playfram 18 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1876 Positron Projectile (cm\protoss\positron-projectile.grp) +.headerstart +IsId 786 +Type 2 +Init PositronProjectileInit +Death PositronProjectileDeath +GndAttkInit PositronProjectileLoop +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +PositronProjectileInit: + playfram 25 + wait 1 + sigorder 1 + wait 1 + playfram 26 + wait 1 + playfram 27 +PositronProjectileLoop: + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 17 + 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 + playfram 24 + wait 1 + playfram 25 + wait 1 + playfram 26 + wait 1 + playfram 27 + goto PositronProjectileLoop -## Next free IsId: 786 \ No newline at end of file +PositronProjectileDeath: + playsnd 2848 # Panoptus weaponhit 01 + domissiledmg + 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 + playfram 34 + wait 1 + playfram 35 + wait 1 + playfram 36 + wait 1 + playfram 37 + wait 1 + playfram 38 + wait 1 + playfram 39 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1877 Demiurge Worship Overlay Small (cm\protoss\demiurge-worship-overlay-small.grp) +# 1878 Demiurge Worship Overlay Medium (cm\protoss\demiurge-worship-overlay-medium.grp) +# 1879 Demiurge Worship Overlay Large (cm\protoss\demiurge-worship-overlay-large.grp) +# 1880 Demiurge Worship Overlay XLarge (cm\protoss\demiurge-worship-overlay-xlarge.grp) +.headerstart +IsId 787 +Type 1 +Init DemiurgeWorshipProcInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +DemiurgeWorshipProcInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + 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 + playfram 14 + wait 1 + end + +## Next free IsId: 788 \ No newline at end of file diff --git a/mpq/unit/cm/protoss/worship-large.grp b/mpq/unit/cm/protoss/demiurge-worship-overlay-large.grp similarity index 100% rename from mpq/unit/cm/protoss/worship-large.grp rename to mpq/unit/cm/protoss/demiurge-worship-overlay-large.grp diff --git a/mpq/unit/cm/protoss/worship-small.grp b/mpq/unit/cm/protoss/demiurge-worship-overlay-medium.grp similarity index 100% rename from mpq/unit/cm/protoss/worship-small.grp rename to mpq/unit/cm/protoss/demiurge-worship-overlay-medium.grp diff --git a/mpq/unit/cm/protoss/demiurge-worship-overlay-small.grp b/mpq/unit/cm/protoss/demiurge-worship-overlay-small.grp new file mode 100644 index 00000000..148d2d0f Binary files /dev/null and b/mpq/unit/cm/protoss/demiurge-worship-overlay-small.grp differ diff --git a/mpq/unit/cm/protoss/demiurge-worship-overlay-xlarge.grp b/mpq/unit/cm/protoss/demiurge-worship-overlay-xlarge.grp new file mode 100644 index 00000000..fe35e70c Binary files /dev/null and b/mpq/unit/cm/protoss/demiurge-worship-overlay-xlarge.grp differ diff --git a/mpq/unit/cm/protoss/demiurge-worship-proc-large.grp b/mpq/unit/cm/protoss/demiurge-worship-proc-large.grp new file mode 100644 index 00000000..81f6a3a7 Binary files /dev/null and b/mpq/unit/cm/protoss/demiurge-worship-proc-large.grp differ diff --git a/mpq/unit/cm/protoss/demiurge-worship-proc-medium.grp b/mpq/unit/cm/protoss/demiurge-worship-proc-medium.grp new file mode 100644 index 00000000..87f2c499 Binary files /dev/null and b/mpq/unit/cm/protoss/demiurge-worship-proc-medium.grp differ diff --git a/mpq/unit/cm/protoss/demiurge-worship-proc-small.grp b/mpq/unit/cm/protoss/demiurge-worship-proc-small.grp new file mode 100644 index 00000000..2cca891c Binary files /dev/null and b/mpq/unit/cm/protoss/demiurge-worship-proc-small.grp differ diff --git a/mpq/unit/cm/protoss/demiurge-worship-proc-xlarge.grp b/mpq/unit/cm/protoss/demiurge-worship-proc-xlarge.grp new file mode 100644 index 00000000..7c64b83a Binary files /dev/null and b/mpq/unit/cm/protoss/demiurge-worship-proc-xlarge.grp differ diff --git a/mpq/unit/cm/protoss/positron-projectile.grp b/mpq/unit/cm/protoss/positron-projectile.grp new file mode 100644 index 00000000..f961cab0 Binary files /dev/null and b/mpq/unit/cm/protoss/positron-projectile.grp differ diff --git a/mpq/unit/cm/protoss/worship-medium.grp b/mpq/unit/cm/protoss/worship-medium.grp deleted file mode 100644 index c4b9bb8c..00000000 Binary files a/mpq/unit/cm/protoss/worship-medium.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/salamander-weaponhit.grp b/mpq/unit/cm/terran/salamander-weaponhit.grp new file mode 100644 index 00000000..e6d68417 Binary files /dev/null and b/mpq/unit/cm/terran/salamander-weaponhit.grp differ diff --git a/patchnotes.md b/patchnotes.md index 16f15aea..584e56d3 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -56,7 +56,6 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues - Replaced sprites for: - Hierophant (c. Baelethal) - Optecton -- Added weaponhit for Magister - Added reads for: - Maverick Stimpack (inject, proc, expire) - Savant form switch @@ -64,15 +63,21 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues - Olympian Dishonorable Discharge proc - Magnetar Law of Attraction proc - Gladius Binding Plasma charge (visuals) and proc (audio) - - Herald Triumphant Rise / Patriarch Astral Rule debuffs - Vengeful Ascension buffs -- Added banter for: - - Eidolon - successful missile strike - - Hierophant - a nearby enemy dies with full Signify stacks + - Herald Triumphant Rise / Patriarch Astral Rule debuffs + - Demiurge Worship (looping overlay on victims) +- Added projectiles for: + - Positron +- Added weapon impacts for: + - Salamander + - Magister - Added portraits (c. jun3hong) for: - Striga - Pythean - Amaranth +- Added banter for: + - Eidolon - successful missile strike + - Hierophant - a nearby enemy dies with full Signify stacks - Advisors: - Replaced default Zerg advisor - Achieved custom advisor support for: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f49e114b..1b3d0e9c 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ