diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 5cf4626e..a7f6aa4c 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 a6508999..562e5c61 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -514,7 +514,7 @@ Algoztalisk Okrimnilisk Cherbrathalor Grand Library -Extended Flingy #308 +Magister Weapon Impact Extended Flingy #309 Extended Flingy #310 Extended Flingy #311 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a6dbeee0..67d1b33d 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 1dad3062..f7be06b3 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 985d8c96..9519897a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1866,13 +1866,13 @@ Astral Rule - Small Astral Rule - Medium Astral Rule - Large Astral Rule - XLarge -Extended Image #866 -Extended Image #867 -Extended Image #868 -Extended Image #869 -Extended Image #870 -Extended Image #871 -Extended Image #872 +Magister Weapon Impact +Olympian Dishonorable Discharge 1 +Olympian Dishonorable Discharge 2 +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 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 91575189..5d0d6179 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3100,4 +3100,7 @@ cm\advisors\ataltreth\ataltrethad_vespene-01.wav cm\advisors\ataltreth\ataltrethad_warp-01.wav cm\p\gladius\pas-01.wav cm\p\gladius\pas-02.wav -cm\p\gladius\pas-03.wav \ No newline at end of file +cm\p\gladius\pas-03.wav +cm\p\hierophant\banter-b-01.wav +cm\p\hierophant\banter-b-02.wav +cm\p\hierophant\banter-b-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index f9e5d53f..f5a3535a 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 1f8ab7ae..fb88838a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -906,13 +906,13 @@ Okrimnilisk Cherbrathalor Sevenstep Mind Matter Overlay Grand Library -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Magister Weapon Impact +Olympian Dishonorable Discharge 1 +Olympian Dishonorable Discharge 2 +Olympian Dishonorable Discharge 3 +Magnetar Law of Attraction 1 +Magnetar Law of Attraction 2 +Magnetar Law of Attraction 3 Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 699e4d26..5a914515 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 42329136..6f33e735 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -14635,8 +14635,7 @@ ParticleBeamHitDeath: playfram 10 wait 1 playfram 11 - wait 1 - end + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14672,8 +14671,7 @@ DualPhotonBlasterHitDeath: playfram 6 wait 1 playfram 7 - wait 1 - end + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -14708,8 +14706,7 @@ AntiMatterMissileDeath: AntiMatterMissileEmpyrean: playsndbtwn 2016 2019 # Empyrean weaponhit 01, 02, 03, 04 domissiledmg - wait 1 - end + goto Generic_Wait1End # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51180,4 +51177,132 @@ AstralRuleDeath: playfram 29 goto Generic_Wait1End -## Next free IsId: 783 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1868 Magister Weapon Impact (cm\protoss\magister-weaponhit.grp) +.headerstart +IsId 783 +Type 2 +Init MagisterWeaponhitInit +Death MagisterWeaponhitDeath +GndAttkInit MagisterWeaponhitDeath +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MagisterWeaponhitInit: + wait 1 + sigorder 1 + wait 1 +MagisterWeaponhitDeath: + playfram 0x00 + domissiledmg + wait 1 + playfram 2 + wait 1 + playfram 4 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + goto Generic_Wait1End + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1869 Olympian Dishonorable Discharge 1 (cm\terran\olympian-dishonorable-discharge-1.grp) +# 1870 Olympian Dishonorable Discharge 2 (cm\terran\olympian-dishonorable-discharge-2.grp) +# 1871 Olympian Dishonorable Discharge 3 (cm\terran\olympian-dishonorable-discharge-3.grp) +.headerstart +IsId 784 +Type 1 +Init OlympianDishonorableDischargeInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +OlympianDishonorableDischargeInit: + playfram 0x00 + wait 1 + playfram 2 + wait 1 + playfram 4 + 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 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 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) +.headerstart +IsId 785 +Type 1 +Init MagnetarLawOfAttractionInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +MagnetarLawOfAttractionInit: + 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 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 17 + wait 1 + playfram 18 + wait 1 + end + +## Next free IsId: 786 \ No newline at end of file diff --git a/mpq/sound/cm/p/hierophant/banter-b-01.wav b/mpq/sound/cm/p/hierophant/banter-b-01.wav new file mode 100644 index 00000000..44d043f9 Binary files /dev/null and b/mpq/sound/cm/p/hierophant/banter-b-01.wav differ diff --git a/mpq/sound/cm/p/hierophant/banter-b-02.wav b/mpq/sound/cm/p/hierophant/banter-b-02.wav new file mode 100644 index 00000000..6915018e Binary files /dev/null and b/mpq/sound/cm/p/hierophant/banter-b-02.wav differ diff --git a/mpq/sound/cm/p/hierophant/banter-b-03.wav b/mpq/sound/cm/p/hierophant/banter-b-03.wav new file mode 100644 index 00000000..3ce8e1dd Binary files /dev/null and b/mpq/sound/cm/p/hierophant/banter-b-03.wav differ diff --git a/mpq/unit/cm/protoss/magister-weaponhit.grp b/mpq/unit/cm/protoss/magister-weaponhit.grp new file mode 100644 index 00000000..ec88f11d Binary files /dev/null and b/mpq/unit/cm/protoss/magister-weaponhit.grp differ diff --git a/mpq/unit/cm/terran/magnetar-law-of-attraction-1.grp b/mpq/unit/cm/terran/magnetar-law-of-attraction-1.grp new file mode 100644 index 00000000..11fe9a66 Binary files /dev/null and b/mpq/unit/cm/terran/magnetar-law-of-attraction-1.grp differ diff --git a/mpq/unit/cm/terran/magnetar-law-of-attraction-2.grp b/mpq/unit/cm/terran/magnetar-law-of-attraction-2.grp new file mode 100644 index 00000000..11fe9a66 Binary files /dev/null and b/mpq/unit/cm/terran/magnetar-law-of-attraction-2.grp differ diff --git a/mpq/unit/cm/terran/magnetar-law-of-attraction-3.grp b/mpq/unit/cm/terran/magnetar-law-of-attraction-3.grp new file mode 100644 index 00000000..11fe9a66 Binary files /dev/null and b/mpq/unit/cm/terran/magnetar-law-of-attraction-3.grp differ diff --git a/mpq/unit/cm/terran/olympian-dishonorable-discharge-1.grp b/mpq/unit/cm/terran/olympian-dishonorable-discharge-1.grp new file mode 100644 index 00000000..19d881f6 Binary files /dev/null and b/mpq/unit/cm/terran/olympian-dishonorable-discharge-1.grp differ diff --git a/patchnotes.md b/patchnotes.md index 8f1d87b2..5ae19ead 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -51,13 +51,19 @@ 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 - Madcap Cabeirus Feeders achieving full stacks + - 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 - Added portraits (c. jun3hong) for: - Striga - Pythean diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 3dbeef7e..16c60a30 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ